fixed an issue with other units than celsius and removed "foreach" from

project

fancontrol-gui/package/contents/ui/SettingsTab.qml

@@ -80,7 +80,7 @@ Item {
                 value: Fancontrol.Units.fromCelsius(Fancontrol.base.minTemp, Fancontrol.base.unit)
                 suffix: Fancontrol.base.unit
                 onValueChanged: {
-                    Fancontrol.base.minTemp = value;
+                    Fancontrol.base.minTemp = Fancontrol.Units.toCelsius(value, Fancontrol.base.unit);
                     if (value > maxTempBox.value) maxTempBox.value = value;
                 }
             }
@@ -105,7 +105,7 @@ Item {
                 value: Fancontrol.Units.fromCelsius(Fancontrol.base.maxTemp, Fancontrol.base.unit)
                 suffix: Fancontrol.base.unit
                 onValueChanged: {
-                    Fancontrol.base.maxTemp = value;
+                    Fancontrol.base.maxTemp = Fancontrol.Units.toCelsius(value, Fancontrol.base.unit);
                     if (value < minTempBox.value) minTempBox.value = value;
                 }
             }

import/src/guibase.cpp

@@ -59,7 +59,8 @@ GUIBase::GUIBase(QObject *parent) : QObject(parent),
 
     m_loader->parseHwmons();
 
-    foreach (const auto &hwmon, m_loader->hwmons())
+    const auto hwmons = m_loader->hwmons();
+    for (const auto &hwmon : hwmons)
     {
         m_pwmFanModel->addPwmFans(hwmon->pwmFans());
         m_tempModel->addTemps(hwmon->temps());

import/src/hwmon.cpp

@@ -80,7 +80,7 @@ void Hwmon::initialize()
 {
     QDir dir(m_path);
     const auto entries = dir.entryList(QDir::Files | QDir::NoDotAndDotDot);
-    foreach (auto entry, entries)
+    for (const auto &entry : entries)
     {
         if (!entry.contains(QStringLiteral("input")))
             continue;
@@ -101,7 +101,7 @@ void Hwmon::initialize()
             {
                 PwmFan *newPwmFan = Q_NULLPTR;
 
-                foreach (const auto &pwmFan, m_pwmFans)
+                for (const auto &pwmFan : m_pwmFans)
                 {
                     if (pwmFan->index() == index)
                     {
@@ -133,7 +133,7 @@ void Hwmon::initialize()
             {
                 Fan *newFan = Q_NULLPTR;
 
-                foreach (const auto &fan, m_fans)
+                for (const auto &fan : m_fans)
                 {
                     if (fan->index() == index)
                     {
@@ -157,7 +157,7 @@ void Hwmon::initialize()
         {
             Temp *newTemp = Q_NULLPTR;
 
-            foreach (const auto &temp, m_temps)
+            for (const auto &temp : m_temps)
             {
                 if (temp->index() == index)
                 {
@@ -182,7 +182,7 @@ QList<QObject *> Hwmon::fansAsObjects() const
 {
     QList<QObject *> list;
 
-    foreach (const auto &fan, m_fans)
+    for (const auto &fan : m_fans)
         list << qobject_cast<QObject *>(fan);
 
     return list;
@@ -192,7 +192,7 @@ QList<QObject *> Hwmon::pwmFansAsObjects() const
 {
     QList<QObject *> list;
 
-    foreach (const auto &pwmFan, m_pwmFans)
+    for (const auto &pwmFan : m_pwmFans)
         list << qobject_cast<QObject *>(pwmFan);
 
     return list;
@@ -202,7 +202,7 @@ QList<QObject *> Hwmon::tempsAsObjects() const
 {
     QList<QObject *> list;
 
-    foreach (const auto &temp, m_temps)
+    for (const auto &temp : m_temps)
         list << qobject_cast<QObject *>(temp);
 
     return list;
@@ -210,13 +210,13 @@ QList<QObject *> Hwmon::tempsAsObjects() const
 
 void Hwmon::testFans()
 {
-    foreach (const auto &pwmFan, m_pwmFans)
+    for (const auto &pwmFan : m_pwmFans)
         pwmFan->test();
 }
 
 void Hwmon::abortTestingFans()
 {
-    foreach (const auto &pwmFan, m_pwmFans)
+    for (const auto &pwmFan : m_pwmFans)
         pwmFan->abortTest();
 }
 
@@ -239,7 +239,7 @@ bool Hwmon::testing() const
 {
     auto testing = false;
 
-    foreach (const auto &fan, m_pwmFans)
+    for (const auto &fan : m_pwmFans)
     {
         if (fan->testing())
         {
@@ -253,7 +253,7 @@ bool Hwmon::testing() const
 
 void Hwmon::reset() const
 {
-    foreach (const auto &pwmFan, m_pwmFans)
+    for (const auto &pwmFan : m_pwmFans)
         pwmFan->reset();
 }
 

import/src/loader.cpp

@@ -84,7 +84,7 @@ void Loader::parseHwmons()
     while (!list.isEmpty())
         dereferencedList << QFile::symLinkTarget(hwmonDir.absoluteFilePath(list.takeFirst()));
 
-    foreach (const auto &hwmon, m_hwmons)
+    for (const auto &hwmon : m_hwmons)
     {
         if (!dereferencedList.contains(hwmon->path()))
         {
@@ -96,11 +96,11 @@ void Loader::parseHwmons()
             hwmon->initialize();
     }
 
-    foreach (const auto &hwmonPath, dereferencedList)
+    for (const auto &hwmonPath : dereferencedList)
     {
         auto hwmonExists = false;
 
-        foreach (const auto &hwmon, m_hwmons)
+        for (const auto &hwmon : m_hwmons)
         {
             if (hwmon->path() == hwmonPath)
             {
@@ -205,10 +205,11 @@ bool Loader::parseConfig(QString config)
 {
     //Disconnect hwmons for performance reasons
     //They get reconnected later
-    foreach (const auto &hwmon, m_hwmons)
+    for (const auto &hwmon : m_hwmons)
     {
         disconnect(hwmon, &Hwmon::configUpdateNeeded, this, &Loader::updateConfig);
-        foreach (const auto &pwmFan, hwmon->pwmFans())
+        const auto pwmFans = hwmon->pwmFans();
+        for (const auto &pwmFan : pwmFans)
         {
             qobject_cast<PwmFan *>(pwmFan)->reset();
         }
@@ -234,9 +235,9 @@ bool Loader::parseConfig(QString config)
         line = line.simplified();
         lines << line;
     }
-    while(!stream.atEnd());
+    while (!stream.atEnd());
 
-    foreach (auto line, lines)
+    for (auto line : lines)
     {
         if (line.startsWith(QStringLiteral("INTERVAL=")))
         {
@@ -250,7 +251,7 @@ bool Loader::parseConfig(QString config)
             else
             {
                 //Connect hwmons again
-                foreach (const auto &hwmon, m_hwmons)
+                for (const auto &hwmon : m_hwmons)
                     connect(hwmon, &Hwmon::configUpdateNeeded, this, &Loader::updateConfig);
 
                 emit error(i18n("Unable to parse interval line: \"%1\"", line), true);
@@ -262,7 +263,7 @@ bool Loader::parseConfig(QString config)
             line.remove(QStringLiteral("FCTEMPS="));
             line = line.simplified();
             const auto fctemps = line.split(' ');
-            foreach (const auto &fctemp, fctemps)
+            for (const auto &fctemp : fctemps)
             {
                 const auto nameValuePair = fctemp.split('=');
                 if (nameValuePair.size() == 2)
@@ -296,7 +297,7 @@ bool Loader::parseConfig(QString config)
             line.remove(QStringLiteral("DEVNAME="));
             line = line.simplified();
             const auto devnames = line.split(' ');
-            foreach (const auto &devname, devnames)
+            for (const auto &devname : devnames)
             {
                 const auto indexNamePair = devname.split('=');
 
@@ -311,7 +312,7 @@ bool Loader::parseConfig(QString config)
                     if (!success)
                     {
                         //Connect hwmons again
-                        foreach (const auto &hwmon, m_hwmons)
+                        for (const auto &hwmon : m_hwmons)
                             connect(hwmon, &Hwmon::configUpdateNeeded, this, &Loader::updateConfig);
 
                         emit error(i18n("Invalid DEVNAME: \"%1\"!", devname), true);
@@ -321,7 +322,7 @@ bool Loader::parseConfig(QString config)
                     if (!hwmonPointer)
                     {
                         //Connect hwmons again
-                        foreach (const auto &hwmon, m_hwmons)
+                        for (const auto &hwmon : m_hwmons)
                             connect(hwmon, &Hwmon::configUpdateNeeded, this, &Loader::updateConfig);
 
                         emit error(i18n("Invalid DEVNAME: \"%1\"! No hwmon with index %2", devname, index), true);
@@ -331,7 +332,7 @@ bool Loader::parseConfig(QString config)
                     if (hwmonPointer->name().split('.').first() != name)
                     {
                         //Connect hwmons again
-                        foreach (const auto &hwmon, m_hwmons)
+                        for (const auto &hwmon : m_hwmons)
                             connect(hwmon, &Hwmon::configUpdateNeeded, this, &Loader::updateConfig);
 
                         emit error(i18n("Wrong name for hwmon %1! Should be \"%2\"", index, hwmonPointer->name().split('.').first()), true);
@@ -376,7 +377,7 @@ bool Loader::parseConfig(QString config)
             !line.startsWith(QStringLiteral("FCFANS=")))
         {
             //Connect hwmons again
-            foreach (const auto &hwmon, m_hwmons)
+            for (const auto &hwmon : m_hwmons)
                 connect(hwmon, &Hwmon::configUpdateNeeded, this, &Loader::updateConfig);
 
             emit error(i18n("Unrecognized line in config: \"%1\"", line), true);
@@ -387,7 +388,7 @@ bool Loader::parseConfig(QString config)
     updateConfig();
 
     //Connect hwmons again
-    foreach (const auto &hwmon, m_hwmons)
+    for (const auto &hwmon : m_hwmons)
         connect(hwmon, &Hwmon::configUpdateNeeded, this, &Loader::updateConfig);
 
     return true;
@@ -400,7 +401,7 @@ void Loader::parseConfigLine(const QString &line, void (PwmFan::*memberSetFuncti
 
     const auto entries = line.split(' ');
 
-    foreach (const auto &entry, entries)
+    for (const auto &entry : entries)
     {
         const auto fanValuePair = entry.split('=');
         if (fanValuePair.size() == 2)
@@ -578,12 +579,13 @@ QString Loader::createConfig() const
     QList<Hwmon *> usedHwmons;
     QList<PwmFan *> usedFans;
 
-    foreach (const auto &hwmon, m_hwmons)
+    for (const auto &hwmon : m_hwmons)
     {
         if (hwmon->pwmFans().size() > 0 && !usedHwmons.contains(hwmon))
             usedHwmons << hwmon;
 
-        foreach (const auto &pwmFan, hwmon->pwmFans())
+        const auto pwmFans = hwmon->pwmFans();
+        for (const auto &pwmFan : pwmFans)
         {
             if (pwmFan->hasTemp() && pwmFan->temp() && !pwmFan->testing())
             {
@@ -603,7 +605,7 @@ QString Loader::createConfig() const
     {
         configFile += "DEVPATH=";
 
-        foreach (const auto &hwmon, usedHwmons)
+        for (const auto &hwmon : usedHwmons)
         {
             auto sanitizedPath = hwmon->path();
             sanitizedPath.remove(QRegExp("^/sys/"));
@@ -614,7 +616,7 @@ QString Loader::createConfig() const
 
         configFile += "DEVNAME=";
 
-        foreach (const auto &hwmon, usedHwmons)
+        for (const auto &hwmon : usedHwmons)
             configFile += "hwmon" + QString::number(hwmon->index()) + "=" + hwmon->name().split('.').first() + QChar(QChar::Space);
 
         configFile += QChar(QChar::LineFeed);
@@ -623,7 +625,7 @@ QString Loader::createConfig() const
         {
             configFile += "FCTEMPS=";
 
-            foreach (const auto &pwmFan, usedFans)
+            for (const auto &pwmFan : usedFans)
             {
                 configFile += "hwmon" + QString::number(pwmFan->parent()->index()) + "/";
                 configFile += "pwm" + QString::number(pwmFan->index()) + "=";
@@ -634,7 +636,7 @@ QString Loader::createConfig() const
 
             configFile += "FCFANS=";
 
-            foreach (const auto &pwmFan, usedFans)
+            for (const auto &pwmFan : usedFans)
             {
                 configFile += "hwmon" + QString::number(pwmFan->parent()->index()) + "/";
                 configFile += "pwm" + QString::number(pwmFan->index()) + "=";
@@ -645,7 +647,7 @@ QString Loader::createConfig() const
 
             configFile += "MINTEMP=";
 
-            foreach (const auto &pwmFan, usedFans)
+            for (const auto &pwmFan : usedFans)
             {
                 configFile += "hwmon" + QString::number(pwmFan->parent()->index()) + "/";
                 configFile += "pwm" + QString::number(pwmFan->index()) + "=";
@@ -655,7 +657,7 @@ QString Loader::createConfig() const
 
             configFile += "MAXTEMP=";
 
-            foreach (const auto &pwmFan, usedFans)
+            for (const auto &pwmFan : usedFans)
             {
                 configFile += "hwmon" + QString::number(pwmFan->parent()->index()) + "/";
                 configFile += "pwm" + QString::number(pwmFan->index()) + "=";
@@ -665,7 +667,7 @@ QString Loader::createConfig() const
 
             configFile += "MINSTART=";
 
-            foreach (const auto &pwmFan, usedFans)
+            for (const auto &pwmFan : usedFans)
             {
                 configFile += "hwmon" + QString::number(pwmFan->parent()->index()) + "/";
                 configFile += "pwm" + QString::number(pwmFan->index()) + "=";
@@ -675,7 +677,7 @@ QString Loader::createConfig() const
 
             configFile += "MINSTOP=";
 
-            foreach (const auto &pwmFan, usedFans)
+            for (const auto &pwmFan : usedFans)
             {
                 configFile += "hwmon" + QString::number(pwmFan->parent()->index()) + "/";
                 configFile += "pwm" + QString::number(pwmFan->index()) + "=";
@@ -685,7 +687,7 @@ QString Loader::createConfig() const
 
             configFile += "MINPWM=";
 
-            foreach (const auto &pwmFan, usedFans)
+            for (const auto &pwmFan : usedFans)
             {
                 configFile += "hwmon" + QString::number(pwmFan->parent()->index()) + "/";
                 configFile += "pwm" + QString::number(pwmFan->index()) + "=";
@@ -695,7 +697,7 @@ QString Loader::createConfig() const
 
             configFile += "MAXPWM=";
 
-            foreach (const auto &pwmFan, usedFans)
+            for (const auto &pwmFan : usedFans)
             {
                 configFile += "hwmon" + QString::number(pwmFan->parent()->index()) + "/";
                 configFile += "pwm" + QString::number(pwmFan->index()) + "=";
@@ -728,13 +730,13 @@ void Loader::setInterval(int interval, bool writeNewConfig)
 
 void Loader::testFans()
 {
-    foreach (const auto &hwmon, m_hwmons)
+    for (const auto &hwmon : m_hwmons)
         hwmon->testFans();
 }
 
 void Loader::abortTestingFans()
 {
-    foreach (const auto &hwmon, m_hwmons)
+    for (const auto &hwmon : m_hwmons)
         hwmon->abortTestingFans();
 }
 
@@ -817,7 +819,7 @@ void Loader::handleDetectSensorsResult(KJob *job)
 QList<QObject *> Loader::hwmonsAsObjects() const
 {
     auto list = QList<QObject *>();
-    foreach (const auto &hwmon, m_hwmons)
+    for (const auto &hwmon : m_hwmons)
         list << qobject_cast<QObject *>(hwmon);
 
     return list;
@@ -827,7 +829,7 @@ void Loader::handleTestStatusChanged()
 {
     auto testing = false;
 
-    foreach (const auto &hwmon, m_hwmons)
+    for (const auto &hwmon : m_hwmons)
     {
         if (hwmon->testing() == true)
         {
@@ -853,7 +855,7 @@ void Loader::setRestartServiceAfterTesting(bool restart)
 
 void Loader::reset() const
 {
-    foreach (const auto &hwmon, m_hwmons)
+    for (const auto &hwmon : m_hwmons)
         hwmon->reset();
 }
 

import/src/pwmfanmodel.cpp

@@ -42,7 +42,7 @@ void PwmFanModel::setPwmFans(const QList<PwmFan *> &fans)
 
     QStringList list;
 
-    foreach (const auto &fan, fans)
+    for (const auto &fan : fans)
     {
         connect(fan, &PwmFan::nameChanged, this, static_cast<void(PwmFanModel::*)()>(&PwmFanModel::updateFan));
         list << fan->name() + "  (" + fan->path() + ")";
@@ -53,9 +53,9 @@ void PwmFanModel::setPwmFans(const QList<PwmFan *> &fans)
 
 void PwmFanModel::addPwmFans(QList<PwmFan *> newFans)
 {
-    foreach (const auto &newFan, newFans)
+    for (const auto &newFan : newFans)
     {
-        foreach (const auto &fan, m_fans)
+        for (const auto &fan : m_fans)
         {
             if (*fan == *newFan)
             {
@@ -74,7 +74,7 @@ void PwmFanModel::addPwmFans(QList<PwmFan *> newFans)
 
         insertRows(oldSize, newFans.size());
 
-        foreach (const auto &fan, newFans)
+        for (const auto &fan : newFans)
         {
             connect(fan, &PwmFan::nameChanged, this, static_cast<void(PwmFanModel::*)()>(&PwmFanModel::updateFan));
             updateFan(fan);
@@ -115,7 +115,7 @@ void PwmFanModel::updateFan()
 QList<QObject *> PwmFanModel::fans() const
 {
     auto list = QList<QObject *>();
-    foreach(const auto &fan, m_fans)
+    for (const auto &fan : m_fans)
         list << qobject_cast<QObject *>(fan);
     return list;
 }

import/src/systemdcommunicator.cpp

@@ -157,9 +157,9 @@ bool SystemdCommunicator::serviceExists()
         emit error(dbusreply.errorMessage());
         return false;
     }
-    SystemdUnitFileList list = qdbus_cast<SystemdUnitFileList>(dbusreply.arguments().at(0));
+    const auto list = qdbus_cast<SystemdUnitFileList>(dbusreply.arguments().at(0));
 
-    foreach (const auto &unitFile, list)
+    for (const auto &unitFile : list)
     {
         if (unitFile.path.contains(m_serviceName + ".service"))
             return true;

import/src/tempmodel.cpp

@@ -29,7 +29,7 @@ namespace Fancontrol
 {
 
 TempModel::TempModel(QObject *parent) : QStringListModel(parent),
-m_unit(QStringLiteral("°C"))
+    m_unit(QStringLiteral("°C"))
 {
 }
 
@@ -46,7 +46,7 @@ void TempModel::setTemps(const QList<Temp *> &temps)
 
     QStringList list;
 
-    foreach (const auto &temp, temps)
+    for (const auto &temp : temps)
     {
         connect(temp, &Temp::nameChanged, this, static_cast<void(TempModel::*)()>(&TempModel::updateTemp));
         connect(temp, &Temp::valueChanged, this, static_cast<void(TempModel::*)()>(&TempModel::updateTemp));
@@ -59,9 +59,9 @@ void TempModel::setTemps(const QList<Temp *> &temps)
 void TempModel::addTemps(QList<Temp *> newTemps)
 {
 
-    foreach (const auto &newTemp, newTemps)
+    for (const auto &newTemp : newTemps)
     {
-        foreach (const auto &temp, m_temps)
+        for (const auto &temp : m_temps)
         {
             if (*temp == *newTemp)
             {
@@ -80,7 +80,7 @@ void TempModel::addTemps(QList<Temp *> newTemps)
 
         insertRows(oldSize, newTemps.size());
 
-        foreach (const auto &temp, newTemps)
+        for (const auto &temp : 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;
 
-    foreach(const auto &temp, m_temps)
+    for (const auto &temp : m_temps)
         list << qobject_cast<QObject *>(temp);
 
     return list;

kcm/package/contents/ui/KCM.qml

@@ -256,7 +256,7 @@ Item {
                 minimumValue: Units.fromKelvin(0, Fancontrol.base.unit)
                 value: Units.fromCelsius(Fancontrol.base.minTemp, Fancontrol.base.unit)
                 suffix: Fancontrol.base.unit
-                onValueChanged: Fancontrol.base.minTemp = value
+                onValueChanged: Fancontrol.base.minTemp = Units.toCelsius(value, Fancontrol.base.unit)
             }
         }
         RowLayout {
@@ -278,7 +278,7 @@ Item {
                 minimumValue: minTempBox.value
                 value: Units.fromCelsius(Fancontrol.base.maxTemp, Fancontrol.base.unit)
                 suffix: Fancontrol.base.unit
-                onValueChanged: Fancontrol.base.maxTemp = value
+                onValueChanged: Fancontrol.base.maxTemp = Units.toCelsius(value, Fancontrol.base.unit)
             }
         }
         RowLayout {