Переглянути джерело

Removed slots from headers

Malte Veerman 6 роки тому
батько
коміт
4f1be409cc

+ 1 - 5
import/src/fan.h

@@ -45,6 +45,7 @@ public:
     void setName(const QString &name) Q_DECL_OVERRIDE;
     void toDefault() Q_DECL_OVERRIDE;
     bool isValid() const Q_DECL_OVERRIDE;
+    void update() Q_DECL_OVERRIDE;
 
     virtual int pwm() const { return 255; }
     virtual bool setPwm(int, bool) { return false; }
@@ -55,11 +56,6 @@ signals:
     void rpmChanged();
 
 
-public slots:
-
-    void update() Q_DECL_OVERRIDE;
-
-
 protected:
 
     QTextStream *m_rpmStream;

+ 3 - 5
import/src/guibase.h

@@ -100,8 +100,11 @@ public:
     QStringListModel *profileModel() const { return m_profileModel; }
     QString currentProfile() const;
     int currentProfileIndex() const;
+    void handleError(const QString &error, bool critical = false);
+    void handleInfo(const QString &info);
 
     Q_INVOKABLE bool hasSystemdCommunicator() const;
+    Q_INVOKABLE void load();
     Q_INVOKABLE void apply();
     Q_INVOKABLE void reset();
     Q_INVOKABLE void applyProfile(const QString &profileName);
@@ -110,11 +113,6 @@ public:
     Q_INVOKABLE void deleteProfile(const QString &profileName, bool updateModel = true);
     Q_INVOKABLE void deleteProfile(int, bool updateModel = true);
 
-public slots:
-
-    void load();
-    void handleError(const QString &error, bool critical = false);
-    void handleInfo(const QString &info);
 
 signals:
 

+ 3 - 6
import/src/pwmfan.h

@@ -102,6 +102,9 @@ public:
     void setActive(bool active);
     void toDefault() Q_DECL_OVERRIDE;
     bool isValid() const Q_DECL_OVERRIDE;
+    void update() Q_DECL_OVERRIDE;
+    void continueTest();
+
     Q_INVOKABLE void test();
     Q_INVOKABLE void abortTest();
 
@@ -122,12 +125,6 @@ signals:
     void pwmEnableChanged();
 
 
-public slots:
-
-    void update() Q_DECL_OVERRIDE;
-    void continueTest();
-
-
 protected:
 
     QTextStream *m_pwmStream;

+ 3 - 9
import/src/pwmfanmodel.h

@@ -52,17 +52,9 @@ public:
     virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override { Q_UNUSED(parent) return m_fans.size(); }
     virtual QVariant data(const QModelIndex &index, int role = DisplayRole) const override;
     virtual QHash<int, QByteArray> roleNames() const override;
-    Q_INVOKABLE QObject *fan(int index) const;
-
-
-public slots:
-
     void updateFan(PwmFan *fan);
 
-
-private slots:
-
-    void updateFan();
+    Q_INVOKABLE QObject *fan(int index) const;
 
 
 signals:
@@ -72,6 +64,8 @@ signals:
 
 private:
 
+    void updateFan();
+
     QList<PwmFan *> m_fans;
 };
 

+ 1 - 5
import/src/sensor.h

@@ -46,6 +46,7 @@ public:
     virtual void setName(const QString &name) = 0;
     virtual void toDefault() = 0;
     virtual bool isValid() const = 0;
+    virtual void update() = 0;
     QString path() const { return m_path; }
     Hwmon * parent() const { return m_parent; }
     uint index() const { return m_index; }
@@ -54,11 +55,6 @@ public:
     bool operator!=(const Sensor &other) { return m_path != other.path(); }
 
 
-public slots:
-
-    virtual void update() = 0;
-
-
 signals:
 
     void nameChanged();

+ 1 - 5
import/src/systemdcommunicator.h

@@ -70,16 +70,12 @@ signals:
     void info(QString) const;
 
 
-protected slots:
-
-    void updateServiceProperties(const QString&, const QVariantMap&, const QStringList&);
-
-
 protected:
 
     bool dbusAction(const QString &method, const QVariantList &arguments = QVariantList());
     bool systemdServiceActive() const;
     bool systemdServiceEnabled() const;
+    void updateServiceProperties(const QString&, const QVariantMap&, const QStringList&);
 
 
 private:

+ 0 - 4
import/src/temp.h

@@ -49,10 +49,6 @@ public:
     void setName(const QString &name) Q_DECL_OVERRIDE;
     void toDefault() Q_DECL_OVERRIDE;
     bool isValid() const Q_DECL_OVERRIDE;
-
-
-public slots:
-
     void update() Q_DECL_OVERRIDE;