Use init-statements to limit variable scopes

Author: pcolby

src/cli/abstractcommand.cpp

@@ -207,8 +207,7 @@ quint32 AbstractCommand::parseNumber(const QString &value, const QString &unit,
     }
 
     // Parse the number as a (double) floating point number, and check that it is positive.
-    const double dbl = locale.toDouble(number, &ok);
-    if ((ok) && (dbl > 0.0)) {
+    if (const double dbl = locale.toDouble(number, &ok); (ok) && (dbl > 0.0)) {
         if (!ratio.isValid()) {
             for (ratio = makeRatio<R>(); DOKIT_RESULT(dbl) < sensibleMinimum; ratio.num *= 1000);
         }

src/cli/dsocommand.cpp

@@ -56,8 +56,8 @@ QStringList DsoCommand::processOptions(const QCommandLineParser &parser)
     }
 
     // Parse the (required) mode option.
-    const QString mode = parser.value(QLatin1String("mode")).trimmed().toLower();
-    if (mode.startsWith(QLatin1String("ac v")) || mode.startsWith(QLatin1String("vac"))) {
+    if (const QString mode = parser.value(QLatin1String("mode")).trimmed().toLower();
+        mode.startsWith(QLatin1String("ac v")) || mode.startsWith(QLatin1String("vac"))) {
         settings.mode = DsoService::Mode::AcVoltage;
     } else if (mode.startsWith(QLatin1String("dc v")) || mode.startsWith(QLatin1String("vdc"))) {
         settings.mode = DsoService::Mode::DcVoltage;

src/cli/loggerstartcommand.cpp

@@ -55,8 +55,8 @@ QStringList LoggerStartCommand::processOptions(const QCommandLineParser &parser)
     }
 
     // Parse the (required) mode option.
-    const QString mode = parser.value(QLatin1String("mode")).trimmed().toLower();
-    if (mode.startsWith(QLatin1String("ac v")) || mode.startsWith(QLatin1String("vac"))) {
+    if (const QString mode = parser.value(QLatin1String("mode")).trimmed().toLower();
+        mode.startsWith(QLatin1String("ac v")) || mode.startsWith(QLatin1String("vac"))) {
         settings.mode = DataLoggerService::Mode::AcVoltage;
         minRangeFunc = minVoltageRange;
     } else if (mode.startsWith(QLatin1String("dc v")) || mode.startsWith(QLatin1String("vdc"))) {

src/cli/main.cpp

@@ -55,8 +55,8 @@ void configureLogging(const QCommandLineParser &parser)
         QLoggingCategory::setFilterRules(QStringLiteral("dokit.*.debug=true\npokit.*.debug=true"));
     }
 
-    const QString color = parser.value(QStringLiteral("color"));
-    if ((color == QStringLiteral("yes")) || (color == QStringLiteral("auto") && haveConsole())) {
+    if (const QString color = parser.value(QStringLiteral("color"));
+        (color == QStringLiteral("yes")) || (color == QStringLiteral("auto") && haveConsole())) {
         messagePattern.prepend(QStringLiteral(
         "%{if-debug}\x1b[37m%{endif}"      // White
         "%{if-info}\x1b[32m%{endif}"       // Green

src/cli/metercommand.cpp

@@ -54,8 +54,8 @@ QStringList MeterCommand::processOptions(const QCommandLineParser &parser)
     }
 
     // Parse the (required) mode option.
-    const QString mode = parser.value(QLatin1String("mode")).trimmed().toLower();
-    if (mode.startsWith(QLatin1String("ac v")) || mode.startsWith(QLatin1String("vac"))) {
+    if (const QString mode = parser.value(QLatin1String("mode")).trimmed().toLower();
+        mode.startsWith(QLatin1String("ac v")) || mode.startsWith(QLatin1String("vac"))) {
         settings.mode = MultimeterService::Mode::AcVoltage;
         minRangeFunc = minVoltageRange;
     } else if (mode.startsWith(QLatin1String("dc v")) || mode.startsWith(QLatin1String("vdc"))) {

src/cli/settorchcommand.cpp

@@ -46,8 +46,8 @@ QStringList SetTorchCommand::processOptions(const QCommandLineParser &parser)
         return errors;
     }
 
-    const QString value = parser.value(QLatin1String("mode"));
-    if (value.trimmed().compare(QLatin1String("on"), Qt::CaseInsensitive) == 0) {
+    if (const QString value = parser.value(QLatin1String("mode"));
+        value.trimmed().compare(QLatin1String("on"), Qt::CaseInsensitive) == 0) {
         newStatus = StatusService::TorchStatus::On;
     } else if (value.trimmed().compare(QLatin1String("off"), Qt::CaseInsensitive) == 0) {
         newStatus = StatusService::TorchStatus::Off;

src/lib/abstractpokitservice.cpp

@@ -270,8 +270,7 @@ QLowEnergyCharacteristic AbstractPokitServicePrivate::getCharacteristic(const QB
         return QLowEnergyCharacteristic();
     }
 
-    const QLowEnergyCharacteristic characteristic = service->characteristic(uuid);
-    if (characteristic.isValid()) {
+    if (const QLowEnergyCharacteristic characteristic = service->characteristic(uuid); characteristic.isValid()) {
         return characteristic;
     }