diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index 292327051..1ef361533 100644
--- a/cli/cmdlineparser.cpp
+++ b/cli/cmdlineparser.cpp
@@ -376,7 +376,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
                 mSettings->xml = true;
             }
 
-            // use a file filter 
+            // use a file filter
             else if (std::strncmp(argv[i], "--file-filter=", 14) == 0)
                 mSettings->fileFilter = std::string(argv[i] + 14);
 
diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
index 7f9b2ab98..cf344da8b 100644
--- a/cli/cppcheckexecutor.cpp
+++ b/cli/cppcheckexecutor.cpp
@@ -168,14 +168,13 @@ bool CppCheckExecutor::parseFromArgs(CppCheck *cppcheck, int argc, const char* c
                 newList.push_back(fsetting);
             }
         }
-        if (!newList.empty()) 
+        if (!newList.empty())
             settings.project.fileSettings = newList;
         else {
             std::cout << "cppcheck: error: could not find any files matching the filter." << std::endl;
             return false;
         }
-    }
-    else if (!pathnames.empty()) {
+    } else if (!pathnames.empty()) {
         // Execute recursiveAddFiles() to each given file parameter
         const PathMatch matcher(ignored, caseSensitive);
         for (const std::string &pathname : pathnames)
@@ -187,8 +186,7 @@ bool CppCheckExecutor::parseFromArgs(CppCheck *cppcheck, int argc, const char* c
         if (!ignored.empty())
             std::cout << "cppcheck: Maybe all paths were ignored?" << std::endl;
         return false;
-    }
-    else if(!mSettings->fileFilter.empty()) {
+    } else if (!mSettings->fileFilter.empty()) {
         std::map<std::string, std::size_t> newMap;
         for (std::map<std::string, std::size_t>::const_iterator i = mFiles.begin(); i != mFiles.end(); ++i)
             if (Suppressions::matchglob(mSettings->fileFilter, i->first)) {
@@ -201,7 +199,7 @@ bool CppCheckExecutor::parseFromArgs(CppCheck *cppcheck, int argc, const char* c
         }
 
     }
-    
+
     return true;
 }
 
diff --git a/test/testother.cpp b/test/testother.cpp
index d7a6e4c70..a18a1e63f 100644
--- a/test/testother.cpp
+++ b/test/testother.cpp
@@ -4846,7 +4846,7 @@ private:
         ASSERT_EQUALS("", errout.str());
 
         // #6426
-	{
+        {
             const char code[] = "void foo(bool flag) {\n"
                                 "  bar( (flag) ? ~0u : ~0ul);\n"
                                 "}";
@@ -4863,7 +4863,7 @@ private:
             settings.long_bit = 64;
             check(code, &settings);
             ASSERT_EQUALS("", errout.str());
-	}
+        }
     }
 
     void duplicateValueTernary() {