Run clang-format on all cpp/h files

NO_CHANGELOG

1 files changed, 306 insertions, 451 deletions

diff --git a/autotests/test_kconf_update.cpp b/autotests/test_kconf_update.cpp
index f08e06ca..565a86f8 100644
--- a/autotests/test_kconf_update.cpp
+++ b/autotests/test_kconf_update.cpp
@@ -9,13 +9,13 @@
 #include <memory>
 
 // Qt
-#include <QFile>
+#include "config-kconf.h"
 #include <QDir>
-#include <QSharedPointer>
+#include <QFile>
 #include <QProcess>
-#include <qtemporaryfile.h>
+#include <QSharedPointer>
 #include <qstandardpaths.h>
-#include "config-kconf.h"
+#include <qtemporaryfile.h>
 
 #include <qtest.h>
 
@@ -80,225 +80,146 @@ void TestKConfUpdate::test_data()
     QTest::addColumn<bool>("useVersion5");
     QTest::addColumn<bool>("shouldUpdateWork");
 
-    QTest::newRow("moveKeysSameFile")
-            <<
-            "File=testrc\n"
-            "Group=group\n"
-            "Key=old,new\n"
-            "Options=overwrite\n"
-            <<
-            "testrc"
-            <<
-            "[group]\n"
-            "old=value\n"
-            <<
-            "testrc"
-            <<
-            "[$Version]\n"
-            "update_info=%1\n"
-            "\n"
-            "[group]\n"
-            "new=value\n"
-            <<
-            ""
-            << true
-            << true
-            ;
-    QTest::newRow("moveKeysOtherFile")
-            <<
-            "File=oldrc,newrc\n"
-            "Group=group1,group2\n"
-            "Key=old,new\n"
-            "Options=overwrite\n"
-            <<
-            "oldrc"
-            <<
-            "[group1]\n"
-            "old=value\n"
-            "[stay]\n"
-            "foo=bar\n"
-            <<
-            "newrc"
-            <<
-            "[$Version]\n"
-            "update_info=%1\n"
-            "\n"
-            "[group2]\n"
-            "new=value\n"
-            <<
-            "[$Version]\n"
-            "update_info=%1\n"
-            "\n"
-            "[stay]\n"
-            "foo=bar\n"
-            << true
-            << true
-            ;
-    QTest::newRow("allKeys")
-            <<
-            "File=testrc\n"
-            "Group=group1,group2\n"
-            "AllKeys\n"
-            <<
-            "testrc"
-            <<
-            "[group1]\n"
-            "key1=value1\n"
-            "key2=value2\n"
-            "\n"
-            "[stay]\n"
-            "foo=bar\n"
-            <<
-            "testrc"
-            <<
-            "[$Version]\n"
-            "update_info=%1\n"
-            "\n"
-            "[group2]\n"
-            "key1=value1\n"
-            "key2=value2\n"
-            "\n"
-            "[stay]\n"
-            "foo=bar\n"
-            <<
-            ""
-            << true
-            << true
-            ;
-    QTest::newRow("allKeysSubGroup")
-            <<
-            "File=testrc\n"
-            "Group=[group][sub1],[group][sub2]\n"
-            "AllKeys\n"
-            <<
-            "testrc"
-            <<
-            "[group][sub1]\n"
-            "key1=value1\n"
-            "key2=value2\n"
-            "\n"
-            "[group][sub1][subsub]\n"
-            "key3=value3\n"
-            "key4=value4\n"
-            "\n"
-            "[stay]\n"
-            "foo=bar\n"
-            <<
-            "testrc"
-            <<
-            "[$Version]\n"
-            "update_info=%1\n"
-            "\n"
-            "[group][sub2]\n"
-            "key1=value1\n"
-            "key2=value2\n"
-            "\n"
-            "[group][sub2][subsub]\n"
-            "key3=value3\n"
-            "key4=value4\n"
-            "\n"
-            "[stay]\n"
-            "foo=bar\n"
-            <<
-            ""
-            << true
-            << true
-            ;
-    QTest::newRow("removeGroup")
-            <<
-            "File=testrc\n"
-            "RemoveGroup=remove\n"
-            <<
-            "testrc"
-            <<
-            "[keep]\n"
-            "key=value\n"
-            ""
-            "[remove]\n"
-            "key=value\n"
-            <<
-            "testrc"
-            <<
-            "[$Version]\n"
-            "update_info=%1\n"
-            "\n"
-            "[keep]\n"
-            "key=value\n"
-            <<
-            ""
-            << true
-            << true
-            ;
-    QTest::newRow("moveKeysSameFileDontExist")
-            <<
-            "File=testrc\n"
-            "Group=group,group2\n"
-            "Key=key1\n"
-            "Key=key2\n"
-            <<
-            "testrc"
-            <<
-            "[group]\n"
-            "key1=value1\n"
-            "key3=value3\n"
-            <<
-            "testrc"
-            <<
-            "[$Version]\n"
-            "update_info=%1\n"
-            "\n"
-            "[group]\n"
-            "key3=value3\n"
-            "\n"
-            "[group2]\n"
-            "key1=value1\n"
-            <<
-            ""
-            << true
-            << true
-            ;
-    QTest::newRow("DontMigrateWhenFileDoesntHaveVersion")
-            <<
-            "File=testrc\n"
-            "Group=group\n"
-            "Key=old,new\n"
-            "Options=overwrite\n"
-            <<
-            "testrc"
-            <<
-            "[group]\n"
-            "old=value\n"
-            <<
-            "testrc"
-            <<
-            "[group]\n"
-            "old=value\n"
-            <<
-            ""
-            << false
-            << false
-            ;
-
-    QTest::newRow("DontMigrateWhenUpdateCantDoItMissingFilename")
-            <<
-            "Group=group\n"
-            "Key=old,new\n"
-            "Options=overwrite\n"
-            <<
-            "testrc"
-            <<
-            "[group]\n"
-            "old=value\n"
-            <<
-            "testrc"
-            <<
-            "[group]\n"
-            "old=value\n"
-            <<
-            ""
-            << true
-            << false
-            ;
+    QTest::newRow("moveKeysSameFile") << "File=testrc\n"
+                                         "Group=group\n"
+                                         "Key=old,new\n"
+                                         "Options=overwrite\n"
+                                      << "testrc"
+                                      << "[group]\n"
+                                         "old=value\n"
+                                      << "testrc"
+                                      << "[$Version]\n"
+                                         "update_info=%1\n"
+                                         "\n"
+                                         "[group]\n"
+                                         "new=value\n"
+                                      << "" << true << true;
+    QTest::newRow("moveKeysOtherFile") << "File=oldrc,newrc\n"
+                                          "Group=group1,group2\n"
+                                          "Key=old,new\n"
+                                          "Options=overwrite\n"
+                                       << "oldrc"
+                                       << "[group1]\n"
+                                          "old=value\n"
+                                          "[stay]\n"
+                                          "foo=bar\n"
+                                       << "newrc"
+                                       << "[$Version]\n"
+                                          "update_info=%1\n"
+                                          "\n"
+                                          "[group2]\n"
+                                          "new=value\n"
+                                       << "[$Version]\n"
+                                          "update_info=%1\n"
+                                          "\n"
+                                          "[stay]\n"
+                                          "foo=bar\n"
+                                       << true << true;
+    QTest::newRow("allKeys") << "File=testrc\n"
+                                "Group=group1,group2\n"
+                                "AllKeys\n"
+                             << "testrc"
+                             << "[group1]\n"
+                                "key1=value1\n"
+                                "key2=value2\n"
+                                "\n"
+                                "[stay]\n"
+                                "foo=bar\n"
+                             << "testrc"
+                             << "[$Version]\n"
+                                "update_info=%1\n"
+                                "\n"
+                                "[group2]\n"
+                                "key1=value1\n"
+                                "key2=value2\n"
+                                "\n"
+                                "[stay]\n"
+                                "foo=bar\n"
+                             << "" << true << true;
+    QTest::newRow("allKeysSubGroup") << "File=testrc\n"
+                                        "Group=[group][sub1],[group][sub2]\n"
+                                        "AllKeys\n"
+                                     << "testrc"
+                                     << "[group][sub1]\n"
+                                        "key1=value1\n"
+                                        "key2=value2\n"
+                                        "\n"
+                                        "[group][sub1][subsub]\n"
+                                        "key3=value3\n"
+                                        "key4=value4\n"
+                                        "\n"
+                                        "[stay]\n"
+                                        "foo=bar\n"
+                                     << "testrc"
+                                     << "[$Version]\n"
+                                        "update_info=%1\n"
+                                        "\n"
+                                        "[group][sub2]\n"
+                                        "key1=value1\n"
+                                        "key2=value2\n"
+                                        "\n"
+                                        "[group][sub2][subsub]\n"
+                                        "key3=value3\n"
+                                        "key4=value4\n"
+                                        "\n"
+                                        "[stay]\n"
+                                        "foo=bar\n"
+                                     << "" << true << true;
+    QTest::newRow("removeGroup") << "File=testrc\n"
+                                    "RemoveGroup=remove\n"
+                                 << "testrc"
+                                 << "[keep]\n"
+                                    "key=value\n"
+                                    ""
+                                    "[remove]\n"
+                                    "key=value\n"
+                                 << "testrc"
+                                 << "[$Version]\n"
+                                    "update_info=%1\n"
+                                    "\n"
+                                    "[keep]\n"
+                                    "key=value\n"
+                                 << "" << true << true;
+    QTest::newRow("moveKeysSameFileDontExist") << "File=testrc\n"
+                                                  "Group=group,group2\n"
+                                                  "Key=key1\n"
+                                                  "Key=key2\n"
+                                               << "testrc"
+                                               << "[group]\n"
+                                                  "key1=value1\n"
+                                                  "key3=value3\n"
+                                               << "testrc"
+                                               << "[$Version]\n"
+                                                  "update_info=%1\n"
+                                                  "\n"
+                                                  "[group]\n"
+                                                  "key3=value3\n"
+                                                  "\n"
+                                                  "[group2]\n"
+                                                  "key1=value1\n"
+                                               << "" << true << true;
+    QTest::newRow("DontMigrateWhenFileDoesntHaveVersion") << "File=testrc\n"
+                                                             "Group=group\n"
+                                                             "Key=old,new\n"
+                                                             "Options=overwrite\n"
+                                                          << "testrc"
+                                                          << "[group]\n"
+                                                             "old=value\n"
+                                                          << "testrc"
+                                                          << "[group]\n"
+                                                             "old=value\n"
+                                                          << "" << false << false;
+
+    QTest::newRow("DontMigrateWhenUpdateCantDoItMissingFilename") << "Group=group\n"
+                                                                     "Key=old,new\n"
+                                                                     "Options=overwrite\n"
+                                                                  << "testrc"
+                                                                  << "[group]\n"
+                                                                     "old=value\n"
+                                                                  << "testrc"
+                                                                  << "[group]\n"
+                                                                     "old=value\n"
+                                                                  << "" << true << false;
 }
 
 void TestKConfUpdate::test()
@@ -362,238 +283,172 @@ void TestKConfUpdate::testScript_data()
     QTest::addColumn<QString>("oldConfContent");
     QTest::addColumn<QString>("expectedNewConfContent");
 
-    QTest::newRow("delete-key")
-            <<
-            "File=testrc\n"
-            "Group=group\n"
-            "Script=test.sh,sh\n"
-            <<
-            "echo '# DELETE deprecated'\n"
-            <<
-            "[group]\n"
-            "deprecated=foo\n"
-            "valid=bar\n"
-            <<
-            "[$Version]\n"
-            "update_info=%1\n"
-            "\n"
-            "[group]\n"
-            "valid=bar\n"
-            ;
-
-    QTest::newRow("delete-key2")
-            <<
-            "File=testrc\n"
-            "Script=test.sh,sh\n"
-            <<
-            "echo '# DELETE [group]deprecated'\n"
-            "echo '# DELETE [group][sub]deprecated2'\n"
-            <<
-            "[group]\n"
-            "deprecated=foo\n"
-            "valid=bar\n"
-            "\n"
-            "[group][sub]\n"
-            "deprecated2=foo\n"
-            "valid2=bar\n"
-            <<
-            "[$Version]\n"
-            "update_info=%1\n"
-            "\n"
-            "[group]\n"
-            "valid=bar\n"
-            "\n"
-            "[group][sub]\n"
-            "valid2=bar\n"
-            ;
-
-    QTest::newRow("delete-group")
-            <<
-            "File=testrc\n"
-            "Script=test.sh,sh\n"
-            <<
-            "echo '# DELETEGROUP [group1]'\n"
-            "echo '# DELETEGROUP [group2][sub]'\n"
-            <<
-            "[group1]\n"
-            "key=value\n"
-            "\n"
-            "[group2]\n"
-            "valid=bar\n"
-            "\n"
-            "[group2][sub]\n"
-            "key=value\n"
-            <<
-            "[$Version]\n"
-            "update_info=%1\n"
-            "\n"
-            "[group2]\n"
-            "valid=bar\n"
-            ;
-
-    QTest::newRow("delete-group2")
-            <<
-            "File=testrc\n"
-            "Group=group\n"
-            "Script=test.sh,sh\n"
-            <<
-            "echo '# DELETEGROUP'\n"
-            <<
-            "[group]\n"
-            "key=value\n"
-            "\n"
-            "[group2]\n"
-            "valid=bar\n"
-            <<
-            "[$Version]\n"
-            "update_info=%1\n"
-            "\n"
-            "[group2]\n"
-            "valid=bar\n"
-            ;
-
-    QTest::newRow("new-key")
-            <<
-            "File=testrc\n"
-            "Script=test.sh,sh\n"
-            <<
-            "echo '[group]'\n"
-            "echo 'new=value'\n"
-            <<
-            "[group]\n"
-            "valid=bar\n"
-            <<
-            "[$Version]\n"
-            "update_info=%1\n"
-            "\n"
-            "[group]\n"
-            "new=value\n"
-            "valid=bar\n"
-            ;
-
-    QTest::newRow("modify-key-no-overwrite")
-            <<
-            "File=testrc\n"
-            "Script=test.sh,sh\n"
-            <<
-            "echo '[group]'\n"
-            "echo 'existing=new'\n"
-            <<
-            "[group]\n"
-            "existing=old\n"
-            <<
-            "[$Version]\n"
-            "update_info=%1\n"
-            "\n"
-            "[group]\n"
-            "existing=old\n"
-            ;
-
-    QTest::newRow("modify-key-overwrite")
-            <<
-            "File=testrc\n"
-            "Options=overwrite\n"
-            "Script=test.sh,sh\n"
-            <<
-            "echo '[group]'\n"
-            "echo 'existing=new'\n"
-            <<
-            "[group]\n"
-            "existing=old\n"
-            <<
-            "[$Version]\n"
-            "update_info=%1\n"
-            "\n"
-            "[group]\n"
-            "existing=new\n"
-            ;
-
-    QTest::newRow("new-key-in-subgroup")
-            <<
-            "File=testrc\n"
-            "Script=test.sh,sh\n"
-            <<
-            "echo '[group][sub]'\n"
-            "echo 'new=value2'\n"
-            <<
-            "[group][sub]\n"
-            "existing=foo\n"
-            <<
-            "[$Version]\n"
-            "update_info=%1\n"
-            "\n"
-            "[group][sub]\n"
-            "existing=foo\n"
-            "new=value2\n"
-            ;
-
-    QTest::newRow("new-key-in-subgroup2")
-            <<
-            "File=testrc\n"
-            "Script=test.sh,sh\n"
-            <<
-            "echo '[group][sub]'\n"
-            "echo 'new=value3'\n"
-            <<
-            "[group][sub]\n"
-            "existing=foo\n"
-            <<
-            "[$Version]\n"
-            "update_info=%1\n"
-            "\n"
-            "[group][sub]\n"
-            "existing=foo\n"
-            "new=value3\n"
-            ;
+    QTest::newRow("delete-key") << "File=testrc\n"
+                                   "Group=group\n"
+                                   "Script=test.sh,sh\n"
+                                << "echo '# DELETE deprecated'\n"
+                                << "[group]\n"
+                                   "deprecated=foo\n"
+                                   "valid=bar\n"
+                                << "[$Version]\n"
+                                   "update_info=%1\n"
+                                   "\n"
+                                   "[group]\n"
+                                   "valid=bar\n";
+
+    QTest::newRow("delete-key2") << "File=testrc\n"
+                                    "Script=test.sh,sh\n"
+                                 << "echo '# DELETE [group]deprecated'\n"
+                                    "echo '# DELETE [group][sub]deprecated2'\n"
+                                 << "[group]\n"
+                                    "deprecated=foo\n"
+                                    "valid=bar\n"
+                                    "\n"
+                                    "[group][sub]\n"
+                                    "deprecated2=foo\n"
+                                    "valid2=bar\n"
+                                 << "[$Version]\n"
+                                    "update_info=%1\n"
+                                    "\n"
+                                    "[group]\n"
+                                    "valid=bar\n"
+                                    "\n"
+                                    "[group][sub]\n"
+                                    "valid2=bar\n";
+
+    QTest::newRow("delete-group") << "File=testrc\n"
+                                     "Script=test.sh,sh\n"
+                                  << "echo '# DELETEGROUP [group1]'\n"
+                                     "echo '# DELETEGROUP [group2][sub]'\n"
+                                  << "[group1]\n"
+                                     "key=value\n"
+                                     "\n"
+                                     "[group2]\n"
+                                     "valid=bar\n"
+                                     "\n"
+                                     "[group2][sub]\n"
+                                     "key=value\n"
+                                  << "[$Version]\n"
+                                     "update_info=%1\n"
+                                     "\n"
+                                     "[group2]\n"
+                                     "valid=bar\n";
+
+    QTest::newRow("delete-group2") << "File=testrc\n"
+                                      "Group=group\n"
+                                      "Script=test.sh,sh\n"
+                                   << "echo '# DELETEGROUP'\n"
+                                   << "[group]\n"
+                                      "key=value\n"
+                                      "\n"
+                                      "[group2]\n"
+                                      "valid=bar\n"
+                                   << "[$Version]\n"
+                                      "update_info=%1\n"
+                                      "\n"
+                                      "[group2]\n"
+                                      "valid=bar\n";
+
+    QTest::newRow("new-key") << "File=testrc\n"
+                                "Script=test.sh,sh\n"
+                             << "echo '[group]'\n"
+                                "echo 'new=value'\n"
+                             << "[group]\n"
+                                "valid=bar\n"
+                             << "[$Version]\n"
+                                "update_info=%1\n"
+                                "\n"
+                                "[group]\n"
+                                "new=value\n"
+                                "valid=bar\n";
+
+    QTest::newRow("modify-key-no-overwrite") << "File=testrc\n"
+                                                "Script=test.sh,sh\n"
+                                             << "echo '[group]'\n"
+                                                "echo 'existing=new'\n"
+                                             << "[group]\n"
+                                                "existing=old\n"
+                                             << "[$Version]\n"
+                                                "update_info=%1\n"
+                                                "\n"
+                                                "[group]\n"
+                                                "existing=old\n";
+
+    QTest::newRow("modify-key-overwrite") << "File=testrc\n"
+                                             "Options=overwrite\n"
+                                             "Script=test.sh,sh\n"
+                                          << "echo '[group]'\n"
+                                             "echo 'existing=new'\n"
+                                          << "[group]\n"
+                                             "existing=old\n"
+                                          << "[$Version]\n"
+                                             "update_info=%1\n"
+                                             "\n"
+                                             "[group]\n"
+                                             "existing=new\n";
+
+    QTest::newRow("new-key-in-subgroup") << "File=testrc\n"
+                                            "Script=test.sh,sh\n"
+                                         << "echo '[group][sub]'\n"
+                                            "echo 'new=value2'\n"
+                                         << "[group][sub]\n"
+                                            "existing=foo\n"
+                                         << "[$Version]\n"
+                                            "update_info=%1\n"
+                                            "\n"
+                                            "[group][sub]\n"
+                                            "existing=foo\n"
+                                            "new=value2\n";
+
+    QTest::newRow("new-key-in-subgroup2") << "File=testrc\n"
+                                             "Script=test.sh,sh\n"
+                                          << "echo '[group][sub]'\n"
+                                             "echo 'new=value3'\n"
+                                          << "[group][sub]\n"
+                                             "existing=foo\n"
+                                          << "[$Version]\n"
+                                             "update_info=%1\n"
+                                             "\n"
+                                             "[group][sub]\n"
+                                             "existing=foo\n"
+                                             "new=value3\n";
 
     if (QStandardPaths::findExecutable(QStringLiteral("sed")).isEmpty()) {
         qWarning("sed executable not found, cannot run all tests!");
     } else {
-        QTest::newRow("filter")
-            <<
-            "File=testrc\n"
-            "Script=test.sh,sh\n"
-            <<
-            "echo '# DELETE [group]changed'\n"
-            "sed s/value/VALUE/\n"
-            <<
-            "[group]\n"
-            "changed=value\n"
-            "unchanged=value\n"
-            <<
-            "[$Version]\n"
-            "update_info=%1\n"
-            "\n"
-            "[group]\n"
-            "changed=VALUE\n"
-            "unchanged=value\n"
-            ;
-
-    QTest::newRow("filter-subgroup")
-            <<
-            "File=testrc\n"
-            "Script=test.sh,sh\n"
-            <<
-            "echo '# DELETE [group][sub]changed'\n"
-            "sed s/value/VALUE/\n"
-            <<
-            "[group]\n"
-            "unchanged=value\n"
-            "\n"
-            "[group][sub]\n"
-            "changed=value\n"
-            "unchanged=value\n"
-            <<
-            "[$Version]\n"
-            "update_info=%1\n"
-            "\n"
-            "[group]\n"
-            "unchanged=value\n"
-            "\n"
-            "[group][sub]\n"
-            "changed=VALUE\n"
-            "unchanged=value\n"
-            ;
+        QTest::newRow("filter") << "File=testrc\n"
+                                   "Script=test.sh,sh\n"
+                                << "echo '# DELETE [group]changed'\n"
+                                   "sed s/value/VALUE/\n"
+                                << "[group]\n"
+                                   "changed=value\n"
+                                   "unchanged=value\n"
+                                << "[$Version]\n"
+                                   "update_info=%1\n"
+                                   "\n"
+                                   "[group]\n"
+                                   "changed=VALUE\n"
+                                   "unchanged=value\n";
+
+        QTest::newRow("filter-subgroup") << "File=testrc\n"
+                                            "Script=test.sh,sh\n"
+                                         << "echo '# DELETE [group][sub]changed'\n"
+                                            "sed s/value/VALUE/\n"
+                                         << "[group]\n"
+                                            "unchanged=value\n"
+                                            "\n"
+                                            "[group][sub]\n"
+                                            "changed=value\n"
+                                            "unchanged=value\n"
+                                         << "[$Version]\n"
+                                            "update_info=%1\n"
+                                            "\n"
+                                            "[group]\n"
+                                            "unchanged=value\n"
+                                            "\n"
+                                            "[group][sub]\n"
+                                            "changed=VALUE\n"
+                                            "unchanged=value\n";
     }
 }