diff --git a/cfg/cppcheck-lib.cfg b/cfg/cppcheck-lib.cfg
index eb2cc716d..c2896b621 100644
--- a/cfg/cppcheck-lib.cfg
+++ b/cfg/cppcheck-lib.cfg
@@ -1,47 +1,44 @@
-<?xml version="1.0"?>
-<def>
-  <function name="Token::astOperand1,Token::astOperand2,Token::astParent,Token::fileIndex,Token::linenr,Token::function,Token::link,Token::next,Token::previous,Token::scope,Token::str,Token::varId,Token::variable">
-    <noreturn>false</noreturn>
-    <use-retval/>
-  </function>
-
-  <function name="Token::Match">
-    <noreturn>false</noreturn>
-	<use-retval/>
-	<arg nr="1">
-	  <not-uninit/>
-	</arg>
-	<arg nr="2">
-	  <not-uninit/>
-	  <not-null/>
-	  <strz/>
-	</arg>
-	<arg nr="3" default="0">
-	  <not-uninit/>
-	  <not-bool/>
-	</arg>
-  </function>
-
-  <function name="Token::simpleMatch">
-    <noreturn>false</noreturn>
-	<use-retval/>
-	<arg nr="1">
-	  <not-uninit/>
-	</arg>
-	<arg nr="2">
-	  <not-uninit/>
-	  <not-null/>
-	  <strz/>
-	</arg>
-  </function>
-
-  <function name="Token::linkAt,Token::strAt,Token::tokAt">
-    <noreturn>false</noreturn>
-	<use-retval/>
-	<arg nr="1">
-	  <not-uninit/>
-	  <valid>-50:50</valid>
-	  <not-bool/>
-	</arg>
-  </function>
-</def>
+<?xml version="1.0"?>
+<def>
+  <function name="Token::astOperand1,Token::astOperand2,Token::astParent,Token::fileIndex,Token::linenr,Token::function,Token::link,Token::next,Token::previous,Token::scope,Token::str,Token::varId,Token::variable">
+    <noreturn>false</noreturn>
+    <use-retval/>
+  </function>
+  <function name="Token::Match">
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+    <arg nr="3" default="0">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <function name="Token::simpleMatch">
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+  </function>
+  <function name="Token::linkAt,Token::strAt,Token::tokAt">
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <valid>-50:50</valid>
+      <not-bool/>
+    </arg>
+  </function>
+</def>
diff --git a/cfg/std.cfg b/cfg/std.cfg
index 0b205db2b..487d073ce 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -5822,6 +5822,11 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
+  <!-- template< class T > void swap( T& a, T& b );-->
+  <function name="std::swap">
+    <noreturn>false</noreturn>
+    <arg nr="2"/>
+  </function>
   <!-- bool good() const; -->
   <function name="std::ios::good,std::ios_base::good,std::ostream::good,std::ofstream::good">
     <noreturn>false</noreturn>
diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp
index b3fddb592..3984ff2d7 100644
--- a/gui/projectfiledialog.cpp
+++ b/gui/projectfiledialog.cpp
@@ -33,7 +33,8 @@
 #include "cppcheck.h"
 #include "errorlogger.h"
 
-static QString clangTidyCmd() {
+static QString clangTidyCmd()
+{
     QString path = QSettings().value(SETTINGS_CLANG_PATH,QString()).toString();
     if (!path.isEmpty())
         path += '/';