Fix remaining Clang warnings

- Remove else after return/break
- Avoid copies of variables which are used as const-ref
- Simplify boolean return values
- Remove redundant declarations
- Use range-based for where applicable

Change-Id: I5a3e4ba86845ac4d1c6f166c3f808eb06469c28f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

3 files changed, 6 insertions, 9 deletions

diff --git a/tools/testcon/changeproperties.cpp b/tools/testcon/changeproperties.cpp
index 395acc7..cae1f84 100644
--- a/tools/testcon/changeproperties.cpp
+++ b/tools/testcon/changeproperties.cpp
@@ -234,12 +234,10 @@ void ChangeProperties::updateProperties()
                 break;
             case QVariant::List:
                 {
-                    QList<QVariant> varList = var.toList();
+                    const QList<QVariant> varList = var.toList();
                     QStringList strList;
-                    for (int i = 0; i < varList.count(); ++i) {
-                        QVariant var = varList.at(i);
+                    for (const auto &var : varList)
                         strList << var.toString();
-                    }
                     item->setText(2, strList.join(QLatin1String(", ")));
                 }
                 break;
diff --git a/tools/testcon/docuwindow.cpp b/tools/testcon/docuwindow.cpp
index e1c27fe..c5f60e9 100644
--- a/tools/testcon/docuwindow.cpp
+++ b/tools/testcon/docuwindow.cpp
@@ -137,7 +137,7 @@ void DocuWindow::print()
     }
 
     QPrintDialog printDialog(&printer, this);
-    if (!printDialog.exec()) {
+    if (printDialog.exec() == QDialog::Rejected) {
         statusBar()->showMessage(tr("Printing aborted"), 2000);
         return;
     }
diff --git a/tools/testcon/mainwindow.cpp b/tools/testcon/mainwindow.cpp
index 3ff0016..06ce0a0 100644
--- a/tools/testcon/mainwindow.cpp
+++ b/tools/testcon/mainwindow.cpp
@@ -79,10 +79,9 @@ MainWindow::MainWindow(QWidget *parent)
 
     setObjectName(QLatin1String("MainWindow"));
 
-    const int scriptCount = int(sizeof(scriptLanguages) / sizeof(scriptLanguages[0]));
-    for (int s = 0; s < scriptCount; ++s) {
-        const QString name = QLatin1String(scriptLanguages[s].name);
-        const QString suffix = QLatin1String(scriptLanguages[s].suffix);
+    for (auto scriptLanguage : scriptLanguages) {
+        const QString name = QLatin1String(scriptLanguage.name);
+        const QString suffix = QLatin1String(scriptLanguage.suffix);
         if (!QAxScriptManager::registerEngine(name, suffix))
             qWarning().noquote().nospace() << "Failed to register \"" << name
                 << "\" (*" << suffix << ") with QAxScriptManager.";