diff --git a/cfg/qt.cfg b/cfg/qt.cfg
index 9122ac607..864c1a9ce 100644
--- a/cfg/qt.cfg
+++ b/cfg/qt.cfg
@@ -5002,7 +5002,7 @@
     </access>
   </container>
   <!-- Treat QStringList as QList<QString> since we can't remove the template parameter when we inherit. -->
-  <define name="QStringList" value="QList&lt;QString&gt;" />
+  <define name="QStringList" value="QList&lt;QString&gt;"/>
   <define name="Q_ARG(type, data)" value="QArgument&lt;type &gt;(#type, data)"/>
   <!-- TODO: Enable when ticket 8479 got fixed
   <define name="Q_D(Class)" value="Class##Private * const d = d_func()"/>
diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
index 2c1614c03..7f83ba0cf 100644
--- a/lib/checkstl.cpp
+++ b/lib/checkstl.cpp
@@ -674,7 +674,8 @@ void CheckStl::mismatchingContainers()
 
             // Lambda is used to escape the nested loops
             [&] {
-                for (const auto& p : containers) {
+                for (const auto& p : containers)
+                {
                     const std::vector<ArgIteratorInfo>& cargs = p.second;
                     for (ArgIteratorInfo iter1 : cargs) {
                         for (ArgIteratorInfo iter2 : cargs) {
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
index fb35a22b1..bde555e54 100644
--- a/lib/valueflow.cpp
+++ b/lib/valueflow.cpp
@@ -4550,8 +4550,8 @@ static const ValueFlow::Value* getCompareIntValue(const std::list<ValueFlow::Val
             continue;
         if (result)
             result = &std::min(value, *result, [&](const ValueFlow::Value& x, const ValueFlow::Value& y) {
-                return compare(x.intvalue, y.intvalue);
-            });
+            return compare(x.intvalue, y.intvalue);
+        });
         else
             result = &value;
     }
@@ -4561,7 +4561,7 @@ static const ValueFlow::Value* getCompareIntValue(const std::list<ValueFlow::Val
 static const ValueFlow::Value* proveLessThan(const std::list<ValueFlow::Value>& values, MathLib::bigint x)
 {
     const ValueFlow::Value* result = nullptr;
-    const ValueFlow::Value* maxValue = getCompareIntValue(values, std::greater<MathLib::bigint>{});
+    const ValueFlow::Value* maxValue = getCompareIntValue(values, std::greater<MathLib::bigint> {});
     if (maxValue && maxValue->isImpossible() && maxValue->bound == ValueFlow::Value::Bound::Lower) {
         if (maxValue->intvalue <= x)
             result = maxValue;
@@ -4572,7 +4572,7 @@ static const ValueFlow::Value* proveLessThan(const std::list<ValueFlow::Value>&
 static const ValueFlow::Value* proveGreaterThan(const std::list<ValueFlow::Value>& values, MathLib::bigint x)
 {
     const ValueFlow::Value* result = nullptr;
-    const ValueFlow::Value* minValue = getCompareIntValue(values, std::less<MathLib::bigint>{});
+    const ValueFlow::Value* minValue = getCompareIntValue(values, std::less<MathLib::bigint> {});
     if (minValue && minValue->isImpossible() && minValue->bound == ValueFlow::Value::Bound::Upper) {
         if (minValue->intvalue >= x)
             result = minValue;
diff --git a/test/testcondition.cpp b/test/testcondition.cpp
index ec34d0ea6..7cb813d70 100644
--- a/test/testcondition.cpp
+++ b/test/testcondition.cpp
@@ -3332,7 +3332,7 @@ private:
     }
 
     void alwaysTrueInfer() {
-      check("void f(int x) {\n"
+        check("void f(int x) {\n"
               "    if (x > 5) {\n"
               "        x++;\n"
               "        if (x == 1) {}\n"
@@ -3348,7 +3348,7 @@ private:
               "}\n");
         ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (style) Condition 'x!=1' is always true\n", errout.str());
 
-      // #6890
+        // #6890
         check("void f(int i) {\n"
               "    int x = i;\n"
               "    if (x >= 1) {}\n"
diff --git a/test/teststl.cpp b/test/teststl.cpp
index 055479fc3..19ea248b3 100644
--- a/test/teststl.cpp
+++ b/test/teststl.cpp
@@ -580,7 +580,7 @@ private:
               "    const std::string tp2(a.begin(), a.end());\n"
               "}");
         ASSERT_EQUALS( // TODO "[test.cpp:2]: (error) Iterators of different containers are used together.\n"
-                       // TODO "[test.cpp:3]: (error) Iterators of different containers are used together.\n"
+            // TODO "[test.cpp:3]: (error) Iterators of different containers are used together.\n"
             "[test.cpp:4]: (error) Iterators of different containers 'tp3' and 'a' are used together.\n"
             "[test.cpp:5]: (error) Iterators of different containers 'tp4' and 'b' are used together.\n",
             errout.str());