fixed bugs in config file parsing

CMakeLists.txt

@@ -92,10 +92,6 @@ if(BUILD_KCM)
 endif(BUILD_KCM)
 
 
-#summary
-feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
-
-
 #install the shared parts
 if(INSTALL_SHARED)
 
@@ -109,5 +105,13 @@ if(INSTALL_SHARED)
 
     #translations
     ki18n_install(po)
-	    
-endif(INSTALL_SHARED)
+
+endif(INSTALL_SHARED)
+
+
+#run tests
+add_subdirectory(tests)
+
+
+#summary
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)

helper/src/helper.cpp

@@ -22,9 +22,8 @@
 #include <QtCore/QFile>
 #include <QtCore/QTextStream>
 #include <QtCore/QProcess>
-#include <KAuth/KAuthHelperSupport>
 
-#include<KAuth/KAuthHelperSupport>
+#include <KAuth/KAuthHelperSupport>
 
 #ifndef NO_SYSTEMD
 #include <QtDBus/QDBusInterface>

lib/src/loader.cpp

@@ -38,7 +38,6 @@
 //returns a pair of <-1, -1> in case an error occurs
 QPair<int, int> getEntryNumbers(const QString &str)
 {
-    qDebug() << "data:" << str;
     if (str.isEmpty())
     {
         qWarning() << "Loader::getHwmonNumber(): given empty string.";
@@ -83,7 +82,7 @@ QPair<int, int> getEntryNumbers(const QString &str)
         return QPair<int, int>(-1, -1);
     }
         
-    return QPair<int, int>(hwmonResult, sensorResult);
+    return QPair<int, int>(hwmonResult, sensorResult - 1);
 }
 
 
@@ -360,7 +359,9 @@ bool Loader::load(const QUrl &url)
             line.remove("MAXPWM=");
             parseConfigLine(line, &PwmFan::setMaxPwm);
         }
-        else
+        else if (!line.startsWith("DEVNAME=") && 
+                 !line.startsWith("DEVPATH=") &&
+                 !line.startsWith("FCFANS="))
             qWarning() << "Unrecognized line in config:" << line;
     }