From ec5dff4b756c1f60b4b19ce8ad1f721790bad181 Mon Sep 17 00:00:00 2001
From: arcan1s <esalexeev@gmail.com>
Date: Mon, 21 Jul 2014 12:11:30 +0400
Subject: [PATCH] yae reading files`

---
 PKGBUILD                           |  2 +-
 sources/dataengine/netctl.cpp      | 27 ++++++++++++-----------
 sources/gui/src/language.cpp       |  4 ++--
 sources/gui/src/settingswindow.cpp |  4 ++--
 sources/plasmoid/netctl.cpp        | 35 +++++++++++++++---------------
 5 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index fe3093d..a2b3006 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ optdepends=('kdebase-runtime: sudo support'
             'wpa_supplicant: wifi support')
 source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${pkgbase}-${pkgver}-src.tar.xz")
 install="${pkgbase}.install"
-md5sums=('6299c02a0991b54434baa5b96aeba67b')
+md5sums=('2290c8a47dceeda69e523143d82680d4')
 
 
 prepare() {
diff --git a/sources/dataengine/netctl.cpp b/sources/dataengine/netctl.cpp
index 592e83d..c5e8d3b 100644
--- a/sources/dataengine/netctl.cpp
+++ b/sources/dataengine/netctl.cpp
@@ -78,26 +78,27 @@ void Netctl::readConfiguration()
 
     QString fileName = KGlobal::dirs()->findResource("config", "netctl.conf");
     if (debug) qDebug() << "[DE]" << "[readConfiguration]" << ":" << "Configuration file" << fileName;
-    QFile confFile(fileName);
-    if (!confFile.open(QIODevice::ReadOnly)) {
+    QFile configFile(fileName);
+    if (!configFile.open(QIODevice::ReadOnly)) {
         configuration = updateConfiguration(rawConfig);
         return;
     }
     QString fileStr;
     QStringList value;
     while (true) {
-        fileStr = QString(confFile.readLine()).trimmed();
-        if ((fileStr.isEmpty()) && (!confFile.atEnd())) continue;
-        if ((fileStr[0] == QChar('#')) && (!confFile.atEnd())) continue;
-        if ((fileStr[0] == QChar(';')) && (!confFile.atEnd())) continue;
-        if ((!fileStr.contains(QChar('='))) && (!confFile.atEnd())) continue;
-        value.clear();
-        for (int i=1; i<fileStr.split(QChar('=')).count(); i++)
-            value.append(fileStr.split(QChar('='))[i]);
-        rawConfig[fileStr.split(QChar('='))[0]] = value.join(QChar('='));
-        if (confFile.atEnd()) break;
+        fileStr = QString(configFile.readLine()).trimmed();
+        if ((fileStr.isEmpty()) && (!configFile.atEnd())) continue;
+        if ((fileStr[0] == QChar('#')) && (!configFile.atEnd())) continue;
+        if ((fileStr[0] == QChar(';')) && (!configFile.atEnd())) continue;
+        if (fileStr.contains(QChar('='))) {
+            value.clear();
+            for (int i=1; i<fileStr.split(QChar('=')).count(); i++)
+                value.append(fileStr.split(QChar('='))[i]);
+            rawConfig[fileStr.split(QChar('='))[0]] = value.join(QChar('='));
+        }
+        if (configFile.atEnd()) break;
     }
-    confFile.close();
+    configFile.close();
     configuration = updateConfiguration(rawConfig);
 
     return;
diff --git a/sources/gui/src/language.cpp b/sources/gui/src/language.cpp
index 8861f5c..fcff075 100644
--- a/sources/gui/src/language.cpp
+++ b/sources/gui/src/language.cpp
@@ -72,8 +72,8 @@ QString Language::defineLanguageFromFile(const QString configPath)
         if ((fileStr.isEmpty()) && (!configFile.atEnd())) continue;
         if ((fileStr[0] == QChar('#')) && (!configFile.atEnd())) continue;
         if ((fileStr[0] == QChar(';')) && (!configFile.atEnd())) continue;
-        if ((!fileStr.contains(QChar('='))) && (!configFile.atEnd())) continue;
-        settings[fileStr.split(QChar('='))[0]] = fileStr.split(QChar('='))[1];
+        if (fileStr.contains(QChar('=')))
+            settings[fileStr.split(QChar('='))[0]] = fileStr.split(QChar('='))[1];
         if (configFile.atEnd()) break;
     }
     configFile.close();
diff --git a/sources/gui/src/settingswindow.cpp b/sources/gui/src/settingswindow.cpp
index c77bfe3..7497169 100644
--- a/sources/gui/src/settingswindow.cpp
+++ b/sources/gui/src/settingswindow.cpp
@@ -361,8 +361,8 @@ QMap<QString, QString> SettingsWindow::getSettings()
         if ((fileStr.isEmpty()) && (!configFile.atEnd())) continue;
         if ((fileStr[0] == QChar('#')) && (!configFile.atEnd())) continue;
         if ((fileStr[0] == QChar(';')) && (!configFile.atEnd())) continue;
-        if ((!fileStr.contains(QChar('='))) && (!configFile.atEnd())) continue;
-        settings[fileStr.split(QChar('='))[0]] = fileStr.split(QChar('='))[1];
+        if (fileStr.contains(QChar('=')))
+            settings[fileStr.split(QChar('='))[0]] = fileStr.split(QChar('='))[1];
         if (configFile.atEnd()) break;
     }
     configFile.close();
diff --git a/sources/plasmoid/netctl.cpp b/sources/plasmoid/netctl.cpp
index e8fbde6..b8d4059 100644
--- a/sources/plasmoid/netctl.cpp
+++ b/sources/plasmoid/netctl.cpp
@@ -114,24 +114,25 @@ QMap<QString, QString> Netctl::readDataEngineConfiguration()
 
     QString fileName = KGlobal::dirs()->findResource("config", "netctl.conf");
     if (debug) qDebug() << "[PLASMOID]" << "[readDataEngineConfiguration]" << ":" << "Configuration file" << fileName;
-    QFile confFile(fileName);
-    if (!confFile.open(QIODevice::ReadOnly))
+    QFile configFile(fileName);
+    if (!configFile.open(QIODevice::ReadOnly))
         return updateDataEngineConfiguration(rawConfig);
     QString fileStr;
     QStringList value;
     while (true) {
-        fileStr = QString(confFile.readLine()).trimmed();
-        if ((fileStr.isEmpty()) && (!confFile.atEnd())) continue;
-        if ((fileStr[0] == QChar('#')) && (!confFile.atEnd())) continue;
-        if ((fileStr[0] == QChar(';')) && (!confFile.atEnd())) continue;
-        if ((!fileStr.contains(QChar('='))) && (!confFile.atEnd())) continue;
-        value.clear();
-        for (int i=1; i<fileStr.split(QChar('=')).count(); i++)
-            value.append(fileStr.split(QChar('='))[i]);
-        rawConfig[fileStr.split(QChar('='))[0]] = value.join(QChar('='));
-        if (confFile.atEnd()) break;
+        fileStr = QString(configFile.readLine()).trimmed();
+        if ((fileStr.isEmpty()) && (!configFile.atEnd())) continue;
+        if ((fileStr[0] == QChar('#')) && (!configFile.atEnd())) continue;
+        if ((fileStr[0] == QChar(';')) && (!configFile.atEnd())) continue;
+        if (fileStr.contains(QChar('='))) {
+            value.clear();
+            for (int i=1; i<fileStr.split(QChar('=')).count(); i++)
+                value.append(fileStr.split(QChar('='))[i]);
+            rawConfig[fileStr.split(QChar('='))[0]] = value.join(QChar('='));
+        }
+        if (configFile.atEnd()) break;
     }
-    confFile.close();
+    configFile.close();
 
     return updateDataEngineConfiguration(rawConfig);
 }
@@ -144,14 +145,14 @@ void Netctl::writeDataEngineConfiguration(const QMap<QString, QString> settings)
     QMap<QString, QString> config = updateDataEngineConfiguration(settings);
     QString fileName = KGlobal::dirs()->locateLocal("config", "netctl.conf");
     if (debug) qDebug() << "[PLASMOID]" << "[writeDataEngineConfiguration]" << ":" << "Configuration file" << fileName;
-    QFile confFile(fileName);
-    if (!confFile.open(QIODevice::WriteOnly))
+    QFile configFile(fileName);
+    if (!configFile.open(QIODevice::WriteOnly))
         return;
     for (int i=0; i<config.keys().count(); i++) {
         QByteArray string = (config.keys()[i] + QString("=") + config[config.keys()[i]] + QString("\n")).toUtf8();
-        confFile.write(string);
+        configFile.write(string);
     }
-    confFile.close();
+    configFile.close();
 }