Some clazy fixes

fancontrol-gui/src/main.cpp

@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
 
     KDeclarative::QmlObject qmlObject;
     qmlObject.rootContext()->setContextProperty(QStringLiteral("windowConfig"), WindowConfig::instance());
-    qmlObject.loadPackage("org.kde.fancontrol.gui");
+    qmlObject.loadPackage(QStringLiteral("org.kde.fancontrol.gui"));
 
     return app.exec();
 }

helper/src/helper.cpp

@@ -34,6 +34,8 @@
 #include <QtDBus/QDBusVariant>
 
 
+using namespace KAuth;
+
 struct StringStruct
 {
     QString type;

helper/src/helper.h

@@ -19,7 +19,6 @@
 
 #include <KAuth/KAuthActionReply>
 
-using namespace KAuth;
 
 class Helper : public QObject
 {
@@ -27,5 +26,5 @@ class Helper : public QObject
 
     public Q_SLOTS:
 
-        ActionReply action(const QVariantMap &args);
+        KAuth::ActionReply action(const QVariantMap &args);
 };

import/src/hwmon.cpp

@@ -38,6 +38,12 @@ Hwmon::Hwmon(const QString &path, Loader *parent) : QObject(parent),
     m_valid(true),
     m_path(path)
 {
+    if (parent)
+    {
+        connect(this, &Hwmon::configUpdateNeeded, parent, &Loader::updateConfig);
+        connect(this, &Hwmon::error, parent, &Loader::error);
+    }
+
     if (!path.isEmpty())
     {
         QDir dir(path);
@@ -66,12 +72,6 @@ Hwmon::Hwmon(const QString &path, Loader *parent) : QObject(parent),
         delete nameFile;
     }
 
-    if (parent)
-    {
-        connect(this, &Hwmon::configUpdateNeeded, parent, &Loader::updateConfig);
-        connect(this, &Hwmon::error, parent, &Loader::error);
-    }
-
     if (m_valid && !m_path.isEmpty())
         initialize();
 }
@@ -101,7 +101,7 @@ void Hwmon::initialize()
             {
                 PwmFan *newPwmFan = Q_NULLPTR;
 
-                for (const auto &pwmFan : m_pwmFans)
+                for (const auto &pwmFan : qAsConst(m_pwmFans))
                 {
                     if (pwmFan->index() == index)
                     {
@@ -122,10 +122,9 @@ void Hwmon::initialize()
                     emit pwmFansChanged();
                 }
 
-                const auto newFan = qobject_cast<Fan *>(newPwmFan);
-                if (!m_fans.contains(newFan))
+                if (!m_fans.contains(newPwmFan))
                 {
-                    m_fans << newFan;
+                    m_fans << newPwmFan;
                     emit fansChanged();
                 }
             }
@@ -133,7 +132,7 @@ void Hwmon::initialize()
             {
                 Fan *newFan = Q_NULLPTR;
 
-                for (const auto &fan : m_fans)
+                for (const auto &fan : qAsConst(m_fans))
                 {
                     if (fan->index() == index)
                     {
@@ -157,7 +156,7 @@ void Hwmon::initialize()
         {
             Temp *newTemp = Q_NULLPTR;
 
-            for (const auto &temp : m_temps)
+            for (const auto &temp : qAsConst(m_temps))
             {
                 if (temp->index() == index)
                 {
@@ -182,8 +181,8 @@ QList<QObject *> Hwmon::fansAsObjects() const
 {
     QList<QObject *> list;
 
-    for (const auto &fan : m_fans)
-        list << qobject_cast<QObject *>(fan);
+    for (const auto &fan : qAsConst(m_fans))
+        list << fan;
 
     return list;
 }
@@ -192,8 +191,8 @@ QList<QObject *> Hwmon::pwmFansAsObjects() const
 {
     QList<QObject *> list;
 
-    for (const auto &pwmFan : m_pwmFans)
-        list << qobject_cast<QObject *>(pwmFan);
+    for (const auto &pwmFan : qAsConst(m_pwmFans))
+        list << pwmFan;
 
     return list;
 }
@@ -202,21 +201,21 @@ QList<QObject *> Hwmon::tempsAsObjects() const
 {
     QList<QObject *> list;
 
-    for (const auto &temp : m_temps)
-        list << qobject_cast<QObject *>(temp);
+    for (const auto &temp : qAsConst(m_temps))
+        list << temp;
 
     return list;
 }
 
 void Hwmon::testFans()
 {
-    for (const auto &pwmFan : m_pwmFans)
+    for (const auto &pwmFan : qAsConst(m_pwmFans))
         pwmFan->test();
 }
 
 void Hwmon::abortTestingFans()
 {
-    for (const auto &pwmFan : m_pwmFans)
+    for (const auto &pwmFan : qAsConst(m_pwmFans))
         pwmFan->abortTest();
 }
 

import/src/loader.cpp

@@ -87,7 +87,7 @@ void Loader::parseHwmons()
     while (!list.isEmpty())
         dereferencedList << QFile::symLinkTarget(hwmonDir.absoluteFilePath(list.takeFirst()));
 
-    for (const auto &hwmon : m_hwmons)
+    for (const auto &hwmon : qAsConst(m_hwmons))
     {
         if (!dereferencedList.contains(hwmon->path()))
         {
@@ -99,11 +99,11 @@ void Loader::parseHwmons()
             hwmon->initialize();
     }
 
-    for (const auto &hwmonPath : dereferencedList)
+    for (const auto &hwmonPath : qAsConst(dereferencedList))
     {
         auto hwmonExists = false;
 
-        for (const auto &hwmon : m_hwmons)
+        for (const auto &hwmon : qAsConst(m_hwmons))
         {
             if (hwmon->path() == hwmonPath)
             {
@@ -208,7 +208,7 @@ bool Loader::parseConfig(QString config)
 {
     //Disconnect hwmons for performance reasons
     //They get reconnected later
-    for (const auto &hwmon : m_hwmons)
+    for (const auto &hwmon : qAsConst(m_hwmons))
     {
         disconnect(hwmon, &Hwmon::configUpdateNeeded, this, &Loader::updateConfig);
     }
@@ -236,7 +236,7 @@ bool Loader::parseConfig(QString config)
     }
     while (!stream.atEnd());
 
-    for (auto line : lines)
+    for (auto line : qAsConst(lines))
     {
         if (line.startsWith(QStringLiteral("INTERVAL=")))
         {
@@ -366,7 +366,7 @@ bool Loader::parseConfig(QString config)
     updateConfig();
 
     //Connect hwmons again
-    for (const auto &hwmon : m_hwmons)
+    for (const auto &hwmon : qAsConst(m_hwmons))
         connect(hwmon, &Hwmon::configUpdateNeeded, this, &Loader::updateConfig);
 
     return success;
@@ -621,9 +621,9 @@ QString Loader::createConfig() const
 
     if (!usedHwmons.isEmpty())
     {
-        configFile += "DEVPATH=";
+        configFile += QLatin1String("DEVPATH=");
 
-        for (const auto &hwmon : usedHwmons)
+        for (const auto &hwmon : qAsConst(usedHwmons))
         {
             auto sanitizedPath = hwmon->path();
             sanitizedPath.remove(QRegExp("^/sys/"));
@@ -632,18 +632,18 @@ QString Loader::createConfig() const
         }
         configFile += QChar(QChar::LineFeed);
 
-        configFile += "DEVNAME=";
+        configFile += QLatin1String("DEVNAME=");
 
-        for (const auto &hwmon : usedHwmons)
+        for (const auto &hwmon : qAsConst(usedHwmons))
             configFile += "hwmon" + QString::number(hwmon->index()) + "=" + hwmon->name().split('.').first() + QChar(QChar::Space);
 
         configFile += QChar(QChar::LineFeed);
 
         if (!usedFans.isEmpty())
         {
-            configFile += "FCTEMPS=";
+            configFile += QLatin1String("FCTEMPS=");
 
-            for (const auto &pwmFan : usedFans)
+            for (const auto &pwmFan : qAsConst(usedFans))
             {
                 configFile += "hwmon" + QString::number(pwmFan->parent()->index()) + "/";
                 configFile += "pwm" + QString::number(pwmFan->index()) + "=";
@@ -652,9 +652,9 @@ QString Loader::createConfig() const
             }
             configFile += QChar(QChar::LineFeed);
 
-            configFile += "FCFANS=";
+            configFile += QLatin1String("FCFANS=");
 
-            for (const auto &pwmFan : usedFans)
+            for (const auto &pwmFan : qAsConst(usedFans))
             {
                 configFile += "hwmon" + QString::number(pwmFan->parent()->index()) + "/";
                 configFile += "pwm" + QString::number(pwmFan->index()) + "=";
@@ -663,9 +663,9 @@ QString Loader::createConfig() const
             }
             configFile += QChar(QChar::LineFeed);
 
-            configFile += "MINTEMP=";
+            configFile += QLatin1String("MINTEMP=");
 
-            for (const auto &pwmFan : usedFans)
+            for (const auto &pwmFan : qAsConst(usedFans))
             {
                 configFile += "hwmon" + QString::number(pwmFan->parent()->index()) + "/";
                 configFile += "pwm" + QString::number(pwmFan->index()) + "=";
@@ -673,9 +673,9 @@ QString Loader::createConfig() const
             }
             configFile += QChar(QChar::LineFeed);
 
-            configFile += "MAXTEMP=";
+            configFile += QLatin1String("MAXTEMP=");
 
-            for (const auto &pwmFan : usedFans)
+            for (const auto &pwmFan : qAsConst(usedFans))
             {
                 configFile += "hwmon" + QString::number(pwmFan->parent()->index()) + "/";
                 configFile += "pwm" + QString::number(pwmFan->index()) + "=";
@@ -683,9 +683,9 @@ QString Loader::createConfig() const
             }
             configFile += QChar(QChar::LineFeed);
 
-            configFile += "MINSTART=";
+            configFile += QLatin1String("MINSTART=");
 
-            for (const auto &pwmFan : usedFans)
+            for (const auto &pwmFan : qAsConst(usedFans))
             {
                 configFile += "hwmon" + QString::number(pwmFan->parent()->index()) + "/";
                 configFile += "pwm" + QString::number(pwmFan->index()) + "=";
@@ -693,9 +693,9 @@ QString Loader::createConfig() const
             }
             configFile += QChar(QChar::LineFeed);
 
-            configFile += "MINSTOP=";
+            configFile += QLatin1String("MINSTOP=");
 
-            for (const auto &pwmFan : usedFans)
+            for (const auto &pwmFan : qAsConst(usedFans))
             {
                 configFile += "hwmon" + QString::number(pwmFan->parent()->index()) + "/";
                 configFile += "pwm" + QString::number(pwmFan->index()) + "=";
@@ -703,9 +703,9 @@ QString Loader::createConfig() const
             }
             configFile += QChar(QChar::LineFeed);
 
-            configFile += "MINPWM=";
+            configFile += QLatin1String("MINPWM=");
 
-            for (const auto &pwmFan : usedFans)
+            for (const auto &pwmFan : qAsConst(usedFans))
             {
                 configFile += "hwmon" + QString::number(pwmFan->parent()->index()) + "/";
                 configFile += "pwm" + QString::number(pwmFan->index()) + "=";
@@ -713,9 +713,9 @@ QString Loader::createConfig() const
             }
             configFile += QChar(QChar::LineFeed);
 
-            configFile += "MAXPWM=";
+            configFile += QLatin1String("MAXPWM=");
 
-            for (const auto &pwmFan : usedFans)
+            for (const auto &pwmFan : qAsConst(usedFans))
             {
                 configFile += "hwmon" + QString::number(pwmFan->parent()->index()) + "/";
                 configFile += "pwm" + QString::number(pwmFan->index()) + "=";
@@ -748,13 +748,13 @@ void Loader::setInterval(int interval, bool writeNewConfig)
 
 void Loader::testFans()
 {
-    for (const auto &hwmon : m_hwmons)
+    for (const auto &hwmon : qAsConst(m_hwmons))
         hwmon->testFans();
 }
 
 void Loader::abortTestingFans()
 {
-    for (const auto &hwmon : m_hwmons)
+    for (const auto &hwmon : qAsConst(m_hwmons))
         hwmon->abortTestingFans();
 }
 
@@ -843,7 +843,7 @@ QList<QObject *> Loader::hwmonsAsObjects() const
 {
     auto list = QList<QObject *>();
     for (const auto &hwmon : m_hwmons)
-        list << qobject_cast<QObject *>(hwmon);
+        list << hwmon;
 
     return list;
 }
@@ -852,7 +852,7 @@ void Loader::handleTestStatusChanged()
 {
     auto testing = false;
 
-    for (const auto &hwmon : m_hwmons)
+    for (const auto &hwmon : qAsConst(m_hwmons))
     {
         if (hwmon->testing() == true)
         {
@@ -878,7 +878,7 @@ void Loader::setRestartServiceAfterTesting(bool restart)
 
 void Loader::toDefault()
 {
-    for (const auto &hwmon : m_hwmons)
+    for (const auto &hwmon : qAsConst(m_hwmons))
         hwmon->toDefault();
     }
 }

import/src/loader.h

@@ -76,9 +76,9 @@ public:
     QList<QObject *> hwmonsAsObjects() const;
     int interval() const { return m_interval; }
     void setInterval(int interval, bool writeNewConfig = true);
-    PwmFan *pwmFan(const QPair<int, int> &indexPair) const { return pwmFan(indexPair.first, indexPair.second); }
-    Temp *temp(const QPair<int, int> &indexPair) const { return temp(indexPair.first, indexPair.second); }
-    Fan *fan(const QPair<int, int> &indexPair) const { return fan(indexPair.first, indexPair.second); }
+    PwmFan *pwmFan(QPair<int, int> indexPair) const { return pwmFan(indexPair.first, indexPair.second); }
+    Temp *temp(QPair<int, int> indexPair) const { return temp(indexPair.first, indexPair.second); }
+    Fan *fan(QPair<int, int> indexPair) const { return fan(indexPair.first, indexPair.second); }
     PwmFan *pwmFan(int hwmonIndex, int pwmFanIndex) const;
     Temp *temp(int hwmonIndex, int tempIndex) const;
     Fan *fan(int hwmonIndex, int fanIndex) const;

import/src/pwmfan.cpp

@@ -414,7 +414,7 @@ void PwmFan::continueTest()
         {
             if (m_pwm == 0)
             {
-                error(i18n("Fan never stops."), false);
+                emit error(i18n("Fan never stops."), false);
                 setMinStart(0);
                 setMinStop(0);
                 setMinPwm(0);

import/src/pwmfanmodel.cpp

@@ -54,7 +54,7 @@ void PwmFanModel::addPwmFans(QList<PwmFan *> newFans)
 {
     for (const auto &newFan : newFans)
     {
-        for (const auto &fan : m_fans)
+        for (const auto &fan : qAsConst(m_fans))
         {
             if (*fan == *newFan)
             {
@@ -73,7 +73,7 @@ void PwmFanModel::addPwmFans(QList<PwmFan *> newFans)
 
         insertRows(oldSize, newFans.size());
 
-        for (const auto &fan : newFans)
+        for (const auto &fan : qAsConst(newFans))
         {
             connect(fan, &PwmFan::nameChanged, this, static_cast<void(PwmFanModel::*)()>(&PwmFanModel::updateFan));
             updateFan(fan);
@@ -97,7 +97,7 @@ void PwmFanModel::updateFan(PwmFan *fan)
 
 void PwmFanModel::updateFan()
 {
-    const auto fan = qobject_cast<PwmFan *>(sender());
+    const auto fan = qobject_cast<PwmFan*>(sender());
 
     if (!fan)
         return;
@@ -115,7 +115,7 @@ QList<QObject *> PwmFanModel::fans() const
 {
     auto list = QList<QObject *>();
     for (const auto &fan : m_fans)
-        list << qobject_cast<QObject *>(fan);
+        list << fan;
     return list;
 }
 

import/src/systemdcommunicator.cpp

@@ -88,13 +88,8 @@ SystemdCommunicator::SystemdCommunicator(GUIBase *parent, const QString &service
     else
         setServiceName(serviceName);
 
-    emit serviceNameChanged();
-
     m_serviceActive = systemdServiceActive();
-    emit serviceActiveChanged();
-
     m_serviceEnabled = systemdServiceEnabled();
-    emit serviceEnabledChanged();
 }
 
 void SystemdCommunicator::setServiceName(const QString &name)
@@ -350,7 +345,7 @@ void SystemdCommunicator::reset()
     setServiceEnabled(systemdServiceEnabled());
 }
 
-void SystemdCommunicator::updateServiceProperties(QString, QVariantMap propchanged, QStringList)
+void SystemdCommunicator::updateServiceProperties(const QString&, const QVariantMap &propchanged, const QStringList&)
 {
     if (propchanged.value(QStringLiteral("ActiveState")).isValid())
     {

import/src/systemdcommunicator.h

@@ -72,7 +72,7 @@ signals:
 
 protected slots:
 
-    void updateServiceProperties(QString, QVariantMap, QStringList);
+    void updateServiceProperties(const QString&, const QVariantMap&, const QStringList&);
 
 
 protected:

import/src/tempmodel.cpp

@@ -60,7 +60,7 @@ void TempModel::addTemps(QList<Temp *> newTemps)
 
     for (const auto &newTemp : newTemps)
     {
-        for (const auto &temp : m_temps)
+        for (const auto &temp : qAsConst(m_temps))
         {
             if (*temp == *newTemp)
             {
@@ -79,7 +79,7 @@ void TempModel::addTemps(QList<Temp *> newTemps)
 
         insertRows(oldSize, newTemps.size());
 
-        for (const auto &temp : newTemps)
+        for (const auto &temp : qAsConst(newTemps))
         {
             connect(temp, &Temp::nameChanged, this, static_cast<void(TempModel::*)()>(&TempModel::updateTemp));
             connect(temp, &Temp::valueChanged, this, static_cast<void(TempModel::*)()>(&TempModel::updateTemp));
@@ -121,7 +121,7 @@ QList<QObject *> TempModel::temps() const
     QList<QObject *> list;
 
     for (const auto &temp : m_temps)
-        list << qobject_cast<QObject *>(temp);
+        list << temp;
 
     return list;
 }

import/tests/loadertest.cpp

@@ -43,8 +43,8 @@ void LoaderTest::initTestCase()
 
     QCOMPARE(m_loader->hwmons().size(), 0);
 
-    m_loader->addHwmon(new TestHwmon("radeon", m_rpms.at(0), m_pwms.at(0), m_pwmModes.at(0), m_temps.at(0), 0, m_loader));
-    m_loader->addHwmon(new TestHwmon("coretemp", m_rpms.at(1), m_pwms.at(1), m_pwmModes.at(1), m_temps.at(1), 1, m_loader));
+    m_loader->addHwmon(new TestHwmon(QStringLiteral("radeon"), m_rpms.at(0), m_pwms.at(0), m_pwmModes.at(0), m_temps.at(0), 0, m_loader));
+    m_loader->addHwmon(new TestHwmon(QStringLiteral("coretemp"), m_rpms.at(1), m_pwms.at(1), m_pwmModes.at(1), m_temps.at(1), 1, m_loader));
 
     QCOMPARE(m_loader->hwmons().size(), 2);
 }

import/tests/loadertest.h

@@ -64,8 +64,8 @@ public:
             if (parent)
                 connect(newPwmFan, &PwmFan::testStatusChanged, parent, &Loader::handleTestStatusChanged);
 
-            m_pwmFans << qobject_cast<PwmFan *>(newPwmFan);
-            m_fans << qobject_cast<Fan *>(newPwmFan);
+            m_pwmFans << newPwmFan;
+            m_fans << newPwmFan;
         }
         emit pwmFansChanged();
 
@@ -74,7 +74,7 @@ public:
             const auto newFan = new TestFan(rpms.at(i), i, this);
             connect(this, &Hwmon::sensorsUpdateNeeded, newFan, &Fan::update);
 
-            m_fans << qobject_cast<Fan *>(newFan);
+            m_fans << newFan;
         }
         emit fansChanged();
 
@@ -83,7 +83,7 @@ public:
             const auto newTemp = new TestTemp(temps.at(i), i, this);
             connect(this, &Hwmon::sensorsUpdateNeeded, newTemp, &Temp::update);
 
-            m_temps << qobject_cast<Temp *>(newTemp);
+            m_temps << newTemp;
         }
         emit tempsChanged();
 
@@ -107,7 +107,7 @@ public:
     }
     void addHwmon(TestHwmon *hwmon)
     {
-        addHwmon(qobject_cast<Hwmon *>(hwmon));
+        addHwmon(hwmon);
     }
     void parse(const QString &string)
     {