refactor: move and rename code in order to support a CMAKE_UNITY_BUILD

Author: tnixeu

gui/filelist.cpp

@@ -108,7 +108,7 @@ void FileList::addExcludeList(const QStringList &paths)
     mExcludedPaths = paths;
 }
 
-static std::vector<std::string> toStdStringList(const QStringList &stringList)
+static std::vector<std::string> toStdStringList2(const QStringList &stringList)
 {
     std::vector<std::string> ret;
     std::transform(stringList.cbegin(), stringList.cend(), std::back_inserter(ret), [](const QString& s) {
@@ -120,9 +120,9 @@ static std::vector<std::string> toStdStringList(const QStringList &stringList)
 QStringList FileList::applyExcludeList() const
 {
 #ifdef _WIN32
-    const PathMatch pathMatch(toStdStringList(mExcludedPaths), true);
+    const PathMatch pathMatch(toStdStringList2(mExcludedPaths), true);
 #else
-    const PathMatch pathMatch(toStdStringList(mExcludedPaths), false);
+    const PathMatch pathMatch(toStdStringList2(mExcludedPaths), false);
 #endif
 
     QStringList paths;

gui/test/cppchecklibrarydata/testcppchecklibrarydata.h

@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include "cppchecklibrarydata.h"
 
 #include <QObject>

gui/test/filelist/testfilelist.h

@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include <QObject>
 #include <QString>
 

gui/test/projectfile/testprojectfile.h

@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include <QObject>
 #include <QString>
 

gui/test/translationhandler/testtranslationhandler.h

@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include <QObject>
 #include <QString>
 

gui/test/xmlreportv2/testxmlreportv2.h

@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include <QObject>
 #include <QString>
 

gui/xmlreport.cpp

@@ -29,8 +29,8 @@
 #include <QStringRef>
 #endif
 
-static constexpr char ResultElementName[] = "results";
-static constexpr char VersionAttribute[] = "version";
+static constexpr char ResultElementName2[] = "results";
+static constexpr char VersionAttribute2[] = "version";
 
 XmlReport::XmlReport(const QString &filename) :
     Report(filename)
@@ -70,10 +70,10 @@ int XmlReport::determineVersion(const QString &filename)
     while (!reader.atEnd()) {
         switch (reader.readNext()) {
         case QXmlStreamReader::StartElement:
-            if (reader.name() == QString(ResultElementName)) {
+            if (reader.name() == QString(ResultElementName2)) {
                 QXmlStreamAttributes attribs = reader.attributes();
-                if (attribs.hasAttribute(QString(VersionAttribute))) {
-                    const int ver = attribs.value(QString(), VersionAttribute).toString().toInt();
+                if (attribs.hasAttribute(QString(VersionAttribute2))) {
+                    const int ver = attribs.value(QString(), VersionAttribute2).toString().toInt();
                     return ver;
                 }
                 return 1;

lib/check64bit.cpp

@@ -32,12 +32,10 @@
 
 //---------------------------------------------------------------------------
 
-// CWE ids used
-static const CWE CWE758(758U);   // Reliance on Undefined, Unspecified, or Implementation-Defined Behavior
 
 // Register this check class (by creating a static instance of it)
 namespace {
-    Check64BitPortability instance;
+    Check64BitPortability instance64BitPortability;
 }
 
 void Check64BitPortability::pointerassignment()

lib/checkassert.cpp

@@ -31,12 +31,10 @@
 
 //---------------------------------------------------------------------------
 
-// CWE ids used
-static const CWE CWE398(398U);   // Indicator of Poor Code Quality
 
 // Register this check class (by creating a static instance of it)
 namespace {
-    CheckAssert instance;
+    CheckAssert instanceAssert;
 }
 
 void CheckAssert::assertWithSideEffects()

lib/checkautovariables.cpp

@@ -42,12 +42,9 @@
 
 // Register this check class into cppcheck by creating a static instance of it..
 namespace {
-    CheckAutoVariables instance;
+    CheckAutoVariables instanceAutoVariables;
 }
 
-static const CWE CWE398(398U);  // Indicator of Poor Code Quality
-static const CWE CWE562(562U);  // Return of Stack Variable Address
-static const CWE CWE590(590U);  // Free of Memory not on the Heap
 
 static bool isPtrArg(const Token *tok)
 {