Browse Source

added override declaration in sensors

Malte Veerman 9 years ago
parent
commit
48b3d40b2c

+ 1 - 1
lib/src/fan.h

@@ -56,7 +56,7 @@ signals:
 
 public slots:
 
-    void update();
+    void update() Q_DECL_OVERRIDE;
 
 
 protected:

+ 13 - 8
lib/src/loader.cpp

@@ -42,7 +42,7 @@ Loader::Loader(QObject *parent) : QObject(parent),
     m_configUrl(QUrl::fromLocalFile("/etc/fancontrol")),
     m_error(""),
     m_timer(new QTimer(this))
-{
+{   
     parseHwmons();
 
     m_timer->setSingleShot(false);
@@ -592,16 +592,21 @@ void Loader::detectSensors()
     map["action"] = "detectSensors";
 
     action.setArguments(map);
-    KAuth::ExecuteJob *reply = action.execute();
+    KAuth::ExecuteJob *job = action.execute();
+    
+    connect(job, SIGNAL(result(KJob*)), this, SLOT(handleDetectSensorsResult(KJob*)));
+    job->start();
+}
 
-    if (!reply->exec())
+void Loader::handleDetectSensorsResult(KJob *job)
+{
+    if (job->error())
     {
-        qDebug() << reply->error();
-        setError(reply->errorString() + reply->errorText());
-        return;
+        qDebug() << job->error();
+        setError(job->errorString() + job->errorText());
     }
-
-    parseHwmons();
+    else
+        parseHwmons();
 }
 
 QList<QObject *> Loader::hwmons() const

+ 3 - 1
lib/src/loader.h

@@ -31,6 +31,7 @@
 
 
 class QTimer;
+class KJob;
 
 namespace Fancontrol
 {
@@ -83,7 +84,8 @@ protected slots:
     void emitAllPwmFansChanged() { emit allPwmFansChanged(); }
     void emitAllTempsChanged() { emit allTempsChanged(); }
     void setError(const QString &error);
-        
+    void handleDetectSensorsResult(KJob *job);
+
 
 protected:
     

+ 3 - 3
lib/src/pwmfan.h

@@ -55,7 +55,7 @@ public:
     explicit PwmFan(Hwmon *parent, uint index);
     virtual ~PwmFan();
 
-    int pwm() const { return m_pwm; }
+    int pwm() const Q_DECL_OVERRIDE { return m_pwm; }
     Temp * temp() const { return m_temp; }
     bool hasTemp() const { return m_hasTemp; }
     int minTemp() const { return m_minTemp; }
@@ -67,7 +67,7 @@ public:
     int pwmMode() const { return m_pwmMode; }
     bool active() const;
     bool testing() const;
-    bool setPwm(int pwm, bool write = true);
+    bool setPwm(int pwm, bool write = true) Q_DECL_OVERRIDE;
     void setTemp(Temp *temp) { setHasTemp(temp != Q_NULLPTR); if (temp != m_temp) { m_temp = temp; emit tempChanged(); } }
     void setHasTemp(bool hasTemp) { if (hasTemp != m_hasTemp) { m_hasTemp = hasTemp; emit hasTempChanged(); } }
     void setMinTemp(int minTemp) { if (minTemp != m_minTemp) { m_minTemp = minTemp; emit minTempChanged(); } }
@@ -101,7 +101,7 @@ signals:
 
 protected slots:
 
-    void update();
+    void update() Q_DECL_OVERRIDE;
     void continueTest();
 
 

+ 11 - 11
lib/src/systemdcommunicator.cpp

@@ -252,17 +252,11 @@ bool SystemdCommunicator::dbusAction(const QString &method, const QVariantList &
             map["arguments"] = arguments;
             action.setArguments(map);
 
-            KAuth::ExecuteJob *reply = action.execute();
-
-            if (!reply->exec())
-            {
-                setError(reply->errorString());
-                return false;
-            }
-            else
-            {
-                return true;
-            }
+            KAuth::ExecuteJob *job = action.execute();
+            connect(job, SIGNAL(result(KJob*)), this, SLOT(handleDbusActionResult(KJob*)));
+            job->start();
+            
+            return true;
         }
         setError(dbusreply.errorMessage());
         return false;
@@ -271,6 +265,12 @@ bool SystemdCommunicator::dbusAction(const QString &method, const QVariantList &
     return true;
 }
 
+void SystemdCommunicator::handleDbusActionReply(KJob *job)
+{
+    if (job->error())
+        setError(job->errorString() + job->errorText());
+}
+
 bool SystemdCommunicator::restartService()
 {
     if (serviceExists())

+ 2 - 0
lib/src/systemdcommunicator.h

@@ -27,6 +27,7 @@
 
 
 class QDBusInterface;
+class KJob;
 
 namespace Fancontrol
 {
@@ -65,6 +66,7 @@ signals:
 protected slots:
     
     void updateServiceProperties(QString, QVariantMap, QStringList);
+    void handleDbusActionReply(KJob *job);
     
     
 protected:

+ 1 - 1
lib/src/temp.h

@@ -53,7 +53,7 @@ public:
 
 public slots:
 
-    void update();
+    void update() Q_DECL_OVERRIDE;
 
 
 signals:

+ 1 - 1
package/contents/ui/KCM.qml

@@ -86,7 +86,7 @@ Item {
             }
             ComboBox {
                 id: fanComboBox
-                model: ListModel {
+                model: ListModel {    //ListModel because array of names would reset currentIndex to 0 if a name changes
                     property var fans: kcm.loader.allPwmFans
                     id: fanList
                     Component.onCompleted: {