Remove library icheck project.

162 files changed, 173 insertions, 219 deletions

diff --git a/tests/auto/icheck/icheck.pro b/tests/auto/icheck/icheck.pro
index 5161c2184d..065977a2c5 100644
--- a/tests/auto/icheck/icheck.pro
+++ b/tests/auto/icheck/icheck.pro
@@ -1,10 +1,10 @@
-REL_PATH_TO_SRC = ../../../tools/icheck/ichecklib/src
+REL_PATH_TO_SRC = ../../../tools/icheck/parser/src
 
 QT += testlib xml
 TARGET=tst_icheck
 CONFIG+=testcase
 QT -= gui
-DEFINES += ICHECK_BUILD ICHECKTESTBUILD
+DEFINES += ICHECK_BUILD ICHECK_APP_BUILD
 
 wince*|symbian*: {
     addFiles.sources = testdata/*
@@ -27,13 +27,9 @@ INCLUDEPATH += . \
     $$REL_PATH_TO_SRC/plugins \
     $$REL_PATH_TO_SRC/libs \
     $$REL_PATH_TO_SRC/shared/cplusplus \
-    $$REL_PATH_TO_SRC/tools/ICheck \
     $$REL_PATH_TO_SRC/libs/cplusplus
 
-include(../../../tools/icheck/ichecklib/ichecklib.pri)
-
-CONFIG += mobility
-MOBILITY = icheck
+include(../../../tools/icheck/parser/ichecklib.pri)
 
 SOURCES  += tst_icheck.cpp
 
diff --git a/tests/auto/icheck/tst_icheck.cpp b/tests/auto/icheck/tst_icheck.cpp
index 77bb8785ac..4884348298 100644
--- a/tests/auto/icheck/tst_icheck.cpp
+++ b/tests/auto/icheck/tst_icheck.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include "../../../tools/icheck/ichecklib/ichecklib.h"
+#include "../../../tools/icheck/parser/ichecklib.h"
 #include <qmobilityglobal.h>
 #include <QDir>
 #include <QFile>
diff --git a/tools/icheck/icheck.pro b/tools/icheck/icheck.pro
index da8d808e2a..d9ce45ca63 100644
--- a/tools/icheck/icheck.pro
+++ b/tools/icheck/icheck.pro
@@ -1,6 +1,26 @@
-TEMPLATE  = subdirs
-CONFIG   += ordered
+#-------------------------------------------------
+#
+# Project created by QtCreator 2010-01-18T15:27:35
+#
+#-------------------------------------------------
 
-SUBDIRS = \
-    ichecklib \
-    icheckapp
+REL_PATH_TO_SRC = ../../tools/icheck/parser/src
+
+TEMPLATE = app
+TARGET = icheck
+CONFIG   += console
+DEFINES += ICHECK_BUILD ICHECK_APP_BUILD
+
+INCLUDEPATH += . \
+    $$REL_PATH_TO_SRC/../ \
+    $$REL_PATH_TO_SRC/global \
+    $$REL_PATH_TO_SRC/plugins \
+    $$REL_PATH_TO_SRC/libs \
+    $$REL_PATH_TO_SRC/shared/cplusplus \
+    $$REL_PATH_TO_SRC/libs/cplusplus
+
+include(../../common.pri)
+include(../../features/deploy.pri)
+include(../../tools/icheck/parser/ichecklib.pri)
+
+SOURCES += main.cpp
diff --git a/tools/icheck/icheckapp/icheckapp.pro b/tools/icheck/icheckapp/icheckapp.pro
deleted file mode 100644
index 9c95eba200..0000000000
--- a/tools/icheck/icheckapp/icheckapp.pro
+++ /dev/null
@@ -1,18 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2010-01-18T15:27:35
-#
-#-------------------------------------------------
-
-TEMPLATE = app
-TARGET = icheck
-CONFIG   += console mobility
-
-INCLUDEPATH += ../ichecklib
-
-LIBS += -L../../../bin -lichecklib
-
-include(../../../common.pri)
-include(../../../features/deploy.pri)
-
-SOURCES += main.cpp
diff --git a/tools/icheck/ichecklib/ichecklib.pro b/tools/icheck/ichecklib/ichecklib.pro
deleted file mode 100644
index 556270ff40..0000000000
--- a/tools/icheck/ichecklib/ichecklib.pro
+++ /dev/null
@@ -1,28 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2010-01-21T13:14:55
-#
-#-------------------------------------------------
-REL_PATH_TO_SRC = ./src/
-
-TEMPLATE = lib
-TARGET = ichecklib
-CONFIG += mobility
-DEFINES += ICHECKLIB_LIBRARY ICHECK_BUILD
-
-INCLUDEPATH += ./ \
-    $$REL_PATH_TO_SRC/plugins \
-    $$REL_PATH_TO_SRC/libs \
-    $$REL_PATH_TO_SRC/shared/cplusplus \
-    $$REL_PATH_TO_SRC/libs/cplusplus \
-    $(QTDIR)
-
-include(../../../common.pri)
-include(../../../features/deploy.pri)
-
-#replace the output folder to the bin folder because this
-#library isn't a pugin, it will be used  by a tool located in bin.
-DESTDIR -= $$OUTPUT_DIR/lib
-DESTDIR += $$OUTPUT_DIR/bin
-
-include(ichecklib.pri)
diff --git a/tools/icheck/icheckapp/main.cpp b/tools/icheck/main.cpp
index 77a8848f23..03a3c492ba 100644
--- a/tools/icheck/icheckapp/main.cpp
+++ b/tools/icheck/main.cpp
@@ -11,19 +11,7 @@
 
 using namespace std;
 
-QStringList getQTIncludePath()
-{
-    QStringList ret;
-    QStringList processevironment = QProcess::systemEnvironment();
-    foreach(QString item, processevironment){
-        if(item.indexOf("QTDIR=") == 0){
-            QString qtpath = item.remove("QTDIR=");
-            ret << qtpath + "/include/QtCore";
-            break;
-        }
-    }
-    return ret;
-}
+extern QStringList getQTIncludePath();
 
 int main(int argc, char *argv[])
 {
@@ -91,12 +79,9 @@ int main(int argc, char *argv[])
         }
     }
     else{
-        cout << "CompareHeaderWithHeader.exe";
+        cout << "icheck.exe";
         cout << " \"Interface header\"";
         cout << " \"headerfile to check\"";
     }
-
-    qDebug() << endl << endl << "return value: " << ret;
-    getchar();
     return ret;
 }
diff --git a/tools/icheck/ichecklib/ParseManager.cpp b/tools/icheck/parser/ParseManager.cpp
index 8c2dd0948f..781178b831 100644
--- a/tools/icheck/ichecklib/ParseManager.cpp
+++ b/tools/icheck/parser/ParseManager.cpp
@@ -50,7 +50,7 @@ with return type, function name
 and their arguments and arguments 
 types.
 **********************************/
-bool ParseManager::FUNCTIONITEM::isEqualTo(ParseManager::FUNCTIONITEM *cpfct, bool ignoreName/* = true*/)
+bool FUNCTIONITEM::isEqualTo(FUNCTIONITEM *cpfct, bool ignoreName/* = true*/)
 {
     if(ignoreName)
         return function->isEqualTo(cpfct->function, true);
@@ -65,7 +65,7 @@ and function types.
 
 Q_PROPERTY( ConnectionState state READ state NOTIFY stateChanged);
 ******************************************************************/
-bool ParseManager::PROPERTYITEM::isEqualTo(ParseManager::PROPERTYITEM *cpppt)
+bool PROPERTYITEM::isEqualTo(PROPERTYITEM *cpppt)
 {
     QString thistype = this->trlUnit->spell(this->ast->type_token);
     QString cppttype = cpppt->trlUnit->spell(cpppt->ast->type_token);
@@ -121,7 +121,7 @@ bool ParseManager::PROPERTYITEM::isEqualTo(ParseManager::PROPERTYITEM *cpppt)
 Compares two enums regarding
 of their values created by the getEnumValueStringList function.
 *****************************************************************/
-bool ParseManager::QENUMITEM::isEqualTo(QENUMITEM *cpenum)
+bool QENUMITEM::isEqualTo(QENUMITEM *cpenum)
 {
     if(this->values.count() != cpenum->values.count())
         return false;
@@ -137,7 +137,7 @@ Compares two flags regarding
 of their enum definitions and their 
 values created by the getEnumValueStringList function.
 *****************************************************************/
-bool ParseManager::QFLAGITEM::isEqualTo(QFLAGITEM *cpflag)
+bool QFLAGITEM::isEqualTo(QFLAGITEM *cpflag)
 {
     if(this->enumvalues.count() != cpflag->enumvalues.count())
         return false;
@@ -236,7 +236,7 @@ void ParseManager::parse(CppTools::Internal::CppPreprocessor *preproc,
 //==> list[0] = {Cl1, Cl11, Cl12}
 //    list[1] = {Cl2, Cl21, Cl22}
 
-QList<ParseManager::CLASSTREE*> ParseManager::CreateClassLists()
+QList<CLASSTREE*> ParseManager::CreateClassLists()
 {
     QList<CLASSTREE*>ret;
     QList<CLASSLISTITEM*> classlist;
@@ -633,7 +633,7 @@ bool ParseManager::checkAllMetadatas(ParseManager* pInterfaceParserManager)
 Function that checks all functions
 which will occur in the MetaData
 ***********************************/
-QList<ParseManager::FUNCTIONITEM*> ParseManager::checkMetadataFunctions(const QList<QList<FUNCTIONITEM*> > &classfctlist, const QList<QList<FUNCTIONITEM*> > &iclassfctlist)
+QList<FUNCTIONITEM*> ParseManager::checkMetadataFunctions(const QList<QList<FUNCTIONITEM*> > &classfctlist, const QList<QList<FUNCTIONITEM*> > &iclassfctlist)
 {
     QList<FUNCTIONITEM*> missingifcts;
     //Compare each function from interface with function from header (incl. baseclass functions)
@@ -678,7 +678,7 @@ Check if all function from iclassfctlist are defined
 in the classfctlist as well.
 It will return all the function they are missing.
 ****************************************************/
-QList<ParseManager::FUNCTIONITEM*> ParseManager::containsAllMetadataFunction(const QList<FUNCTIONITEM*> &classfctlist, const QList<FUNCTIONITEM*> &iclassfctlist)
+QList<FUNCTIONITEM*> ParseManager::containsAllMetadataFunction(const QList<FUNCTIONITEM*> &classfctlist, const QList<FUNCTIONITEM*> &iclassfctlist)
 {
     QList<FUNCTIONITEM*> ret;
     foreach(FUNCTIONITEM* ifct, iclassfctlist){
@@ -783,7 +783,7 @@ QString ParseManager::getErrorMessage(FUNCTIONITEM* fct)
 Function that checks all Property
 which will occur in the MetaData
 ***********************************/
-QList<ParseManager::PROPERTYITEM*> ParseManager::checkMetadataProperties(const QList<QList<PROPERTYITEM*> > &classproplist
+QList<PROPERTYITEM*> ParseManager::checkMetadataProperties(const QList<QList<PROPERTYITEM*> > &classproplist
                                                                          , const QList<QList<FUNCTIONITEM*> > &classfctlist
                                                                          , const QList<QList<PROPERTYITEM*> > &iclassproplist
                                                                          , const QList<QList<FUNCTIONITEM*> > &iclassfctlist)
@@ -913,7 +913,7 @@ Function that checks if all functions
 dependencies in Q_PROPERTY have the
 same arguments and retunr value.
 ***************************************/
-QList<ParseManager::PROPERTYITEM*> ParseManager::containsAllPropertyFunction(const QList<PROPERTYITEM*> &classproplist, const QList<PROPERTYITEM*> &iclassproplist)
+QList<PROPERTYITEM*> ParseManager::containsAllPropertyFunction(const QList<PROPERTYITEM*> &classproplist, const QList<PROPERTYITEM*> &iclassproplist)
 {
     QList<PROPERTYITEM*> ret;
     foreach(PROPERTYITEM* ipropt, iclassproplist){
@@ -1010,7 +1010,7 @@ QString ParseManager::getErrorMessage(PROPERTYITEM* ppt)
 Function that checks all enums
 which will occur in the MetaData
 ***********************************/
-QList<ParseManager::QENUMITEM*> ParseManager::checkMetadataEnums(const QList<QList<QENUMITEM*> > &classqenumlist
+QList<QENUMITEM*> ParseManager::checkMetadataEnums(const QList<QList<QENUMITEM*> > &classqenumlist
                                                 , const QList<QList<ENUMITEM*> > &classenumlist
                                                 , const QList<QList<QENUMITEM*> > &iclassqenumlist
                                                 , const QList<QList<ENUMITEM*> > &iclassenumlist)
@@ -1129,7 +1129,7 @@ Function that checkt if the Q_ENUMS
 are completed defined and if the
 Enum values are the same.
 ***********************************/
-QList<ParseManager::QENUMITEM*> ParseManager::containsAllEnums(const QList<QENUMITEM*> &classqenumlist, const QList<QENUMITEM*> &iclassqenumlist)
+QList<QENUMITEM*> ParseManager::containsAllEnums(const QList<QENUMITEM*> &classqenumlist, const QList<QENUMITEM*> &iclassqenumlist)
 {
     QList<QENUMITEM*> ret;
     foreach(QENUMITEM* iqenum, iclassqenumlist){
@@ -1206,7 +1206,7 @@ QString ParseManager::getErrorMessage(QENUMITEM* qenum)
 Function that checks all flags
 which will occur in the MetaData
 ***********************************/
-QList<ParseManager::QFLAGITEM*> ParseManager::checkMetadataFlags(const QList<QList<QFLAGITEM*> > &classqflaglist
+QList<QFLAGITEM*> ParseManager::checkMetadataFlags(const QList<QList<QFLAGITEM*> > &classqflaglist
                                             , const QList<QList<QDECLAREFLAGSITEM*> > &classqdeclareflaglist
                                             , const QList<QList<ENUMITEM*> > &classenumlist
                                             , const QList<QList<QFLAGITEM*> > &iclassqflaglist
@@ -1307,7 +1307,7 @@ Function that compares if all enums
 and flags assigned by using the Q_FLAGS
 are complete defined.
 *****************************************/
-QList<ParseManager::QFLAGITEM*> ParseManager::containsAllFlags(const QList<QFLAGITEM*> &classqflaglist, const QList<QFLAGITEM*> &iclassqflaglist)
+QList<QFLAGITEM*> ParseManager::containsAllFlags(const QList<QFLAGITEM*> &classqflaglist, const QList<QFLAGITEM*> &iclassqflaglist)
 {
     QList<QFLAGITEM*> ret;
     foreach(QFLAGITEM* iqflags, iclassqflaglist){
diff --git a/tools/icheck/ichecklib/ParseManager.h b/tools/icheck/parser/ParseManager.h
index d19853e345..e56d82dbe1 100644
--- a/tools/icheck/ichecklib/ParseManager.h
+++ b/tools/icheck/parser/ParseManager.h
@@ -84,152 +84,151 @@ namespace CPlusPlus {
     class EnumSpecifierAST;
     class Function;
 
-    class ParseManager : public QObject
+    class CLASSLISTITEM
     {
-        Q_OBJECT
-    protected:
-        class CLASSLISTITEM
-        {
-        public:
-            CPlusPlus::TranslationUnit* trlUnit;
-            ClassSpecifierAST* classspec;
-        };
-        class CLASSTREE
-        {
-        public:
-            CLASSLISTITEM* highestlevelclass;
-            QList<CLASSLISTITEM*> classlist;
-        };
-        class FUNCTIONITEM
+    public:
+        CPlusPlus::TranslationUnit* trlUnit;
+        ClassSpecifierAST* classspec;
+    };
+    class CLASSTREE
+    {
+    public:
+        CLASSLISTITEM* highestlevelclass;
+        QList<CLASSLISTITEM*> classlist;
+    };
+    class FUNCTIONITEM
+    {
+    public:
+        const CLASSLISTITEM* highestlevelclass;
+        CPlusPlus::TranslationUnit* trlUnit;
+        ClassSpecifierAST* classAst;
+        QStringList classWichIsNotFound;
+        CPlusPlus::Function* function;
+
+        bool isEqualTo(FUNCTIONITEM* cpfct, bool ignoreName = true);
+        FUNCTIONITEM()
         {
-        public:
-            const CLASSLISTITEM* highestlevelclass;
-            CPlusPlus::TranslationUnit* trlUnit;
-            ClassSpecifierAST* classAst;
-            QStringList classWichIsNotFound;
-            CPlusPlus::Function* function;
+            highestlevelclass = 0;
+            trlUnit = 0;
+            classAst = 0;
+            function = 0;
+        }
+    };
+    class PROPERTYITEM
+    {
+    public:
+        const CLASSLISTITEM* highestlevelclass;
+        QStringList classWichIsNotFound;
+        QPropertyDeclarationAST *ast;
+        CPlusPlus::TranslationUnit* trlUnit;
+        bool readdefined;
+        FUNCTIONITEM *readFct;
+        bool writedefined;
+        FUNCTIONITEM *writeFct;
+        bool resetdefined;
+        FUNCTIONITEM *resetFct;
+        bool notifydefined;
+        FUNCTIONITEM *notifyFct;
+        bool foundalldefinedfct;
 
-            bool isEqualTo(FUNCTIONITEM* cpfct, bool ignoreName = true);
-            FUNCTIONITEM()
-            {
-                highestlevelclass = 0;
-                trlUnit = 0;
-                classAst = 0;
-                function = 0;
-            }
-        };
-        class PROPERTYITEM
+        bool isEqualTo(PROPERTYITEM* cpppt);
+        PROPERTYITEM()
         {
-        public:
-            const CLASSLISTITEM* highestlevelclass;
-            QStringList classWichIsNotFound;
-            QPropertyDeclarationAST *ast;
-            CPlusPlus::TranslationUnit* trlUnit;
-            bool readdefined;
-            FUNCTIONITEM *readFct;
-            bool writedefined;
-            FUNCTIONITEM *writeFct;
-            bool resetdefined;
-            FUNCTIONITEM *resetFct;
-            bool notifydefined;
-            FUNCTIONITEM *notifyFct;
-            bool foundalldefinedfct;
+            highestlevelclass = 0;
+            ast = 0;
+            trlUnit = 0;
+            readdefined = false;
+            readFct = 0;
+            writedefined = false;
+            writeFct = 0;
+            resetdefined = false;
+            resetFct = 0;
+            notifydefined = false;
+            notifyFct = 0;
+            foundalldefinedfct = false;
+        }
+    };
 
-            bool isEqualTo(PROPERTYITEM* cpppt);
-            PROPERTYITEM()
-            {
-                highestlevelclass = 0;
-                ast = 0;
-                trlUnit = 0;
-                readdefined = false;
-                readFct = 0;
-                writedefined = false;
-                writeFct = 0;
-                resetdefined = false;
-                resetFct = 0;
-                notifydefined = false;
-                notifyFct = 0;
-                foundalldefinedfct = false;
-            }
-        };
+    class QENUMITEM
+    {
+    public:
+        const CLASSLISTITEM* highestlevelclass;
+        CPlusPlus::TranslationUnit* trlUnit;
+        QStringList classWichIsNotFound;
+        QEnumDeclarationAST* ast;
+        //an item in this list will be shown like:
+        //EnumName.EnumItemName.Value
+        //ConnectionState.disconnected.0
+        QStringList values;
+        bool foundallenums;
 
-        class QENUMITEM
+        bool isEqualTo(QENUMITEM *cpenum);
+        QENUMITEM()
         {
-        public:
-            const CLASSLISTITEM* highestlevelclass;
-            CPlusPlus::TranslationUnit* trlUnit;
-            QStringList classWichIsNotFound;
-            QEnumDeclarationAST* ast;
-            //an item in this list will be shown like:
-            //EnumName.EnumItemName.Value
-            //ConnectionState.disconnected.0
-            QStringList values;
-            bool foundallenums;
+            highestlevelclass = 0;
+            trlUnit = 0;
+            ast = 0;
+            values.clear();
+            foundallenums = true;
+        }
+    };
 
-            bool isEqualTo(QENUMITEM *cpenum);
-            QENUMITEM()
-            {
-                highestlevelclass = 0;
-                trlUnit = 0;
-                ast = 0;
-                values.clear();
-                foundallenums = true;
-            }
-        };
+    class ENUMITEM
+    {
+    public:
+        const CLASSLISTITEM* highestlevelclass;
+        CPlusPlus::TranslationUnit* trlUnit;
+        QStringList classWichIsNotFound;
+        EnumSpecifierAST* ast;
 
-        class ENUMITEM
+        ENUMITEM()
         {
-        public:
-            const CLASSLISTITEM* highestlevelclass;
-            CPlusPlus::TranslationUnit* trlUnit;
-            QStringList classWichIsNotFound;
-            EnumSpecifierAST* ast;
+            highestlevelclass = 0;
+            trlUnit = 0;
+            ast = 0;
+        }
+    };
 
-            ENUMITEM()
-            {
-                highestlevelclass = 0;
-                trlUnit = 0;
-                ast = 0;
-            }
-        };
+    class QFLAGITEM
+    {
+    public:
+        const CLASSLISTITEM* highestlevelclass;
+        CPlusPlus::TranslationUnit* trlUnit;
+        QStringList classWichIsNotFound;
+        QFlagsDeclarationAST* ast;
+        QStringList enumvalues;
+        bool foundallenums;
 
-        class QFLAGITEM
+        bool isEqualTo(QFLAGITEM *cpflag);
+        QFLAGITEM()
         {
-        public:
-            const CLASSLISTITEM* highestlevelclass;
-            CPlusPlus::TranslationUnit* trlUnit;
-            QStringList classWichIsNotFound;
-            QFlagsDeclarationAST* ast;
-            QStringList enumvalues;
-            bool foundallenums;
+            highestlevelclass = 0;
+            trlUnit = 0;
+            ast = 0;
+            enumvalues.clear();
+            foundallenums = true;
+        }
+    };
 
-            bool isEqualTo(QFLAGITEM *cpflag);
-            QFLAGITEM()
-            {
-                highestlevelclass = 0;
-                trlUnit = 0;
-                ast = 0;
-                enumvalues.clear();
-                foundallenums = true;
-            }
-        };
+    class QDECLAREFLAGSITEM
+    {
+    public:
+        const CLASSLISTITEM* highestlevelclass;
+        CPlusPlus::TranslationUnit* trlUnit;
+        QStringList classWichIsNotFound;
+        QDeclareFlagsDeclarationAST* ast;
 
-        class QDECLAREFLAGSITEM
+        QDECLAREFLAGSITEM()
         {
-        public:
-            const CLASSLISTITEM* highestlevelclass;
-            CPlusPlus::TranslationUnit* trlUnit;
-            QStringList classWichIsNotFound;
-            QDeclareFlagsDeclarationAST* ast;
-
-            QDECLAREFLAGSITEM()
-            {
-                highestlevelclass = 0;
-                trlUnit = 0;
-                ast = 0;
-            }
-        };
+            highestlevelclass = 0;
+            trlUnit = 0;
+            ast = 0;
+        }
+    };
 
+    class ParseManager : public QObject
+    {
+        Q_OBJECT
     public:
         ParseManager();
         virtual ~ParseManager();
diff --git a/tools/icheck/ichecklib/ichecklib.cpp b/tools/icheck/parser/ichecklib.cpp
index 9a1a5bfcaf..9a1a5bfcaf 100644
--- a/tools/icheck/ichecklib/ichecklib.cpp
+++ b/tools/icheck/parser/ichecklib.cpp
diff --git a/tools/icheck/ichecklib/ichecklib.h b/tools/icheck/parser/ichecklib.h
index ed433fdc57..ed433fdc57 100644
--- a/tools/icheck/ichecklib/ichecklib.h
+++ b/tools/icheck/parser/ichecklib.h
diff --git a/tools/icheck/ichecklib/ichecklib.pri b/tools/icheck/parser/ichecklib.pri
index f912c57299..f912c57299 100644
--- a/tools/icheck/ichecklib/ichecklib.pri
+++ b/tools/icheck/parser/ichecklib.pri
diff --git a/tools/icheck/ichecklib/ichecklib_global.h b/tools/icheck/parser/ichecklib_global.h
index 90f9a35acc..cf2bbdc7f3 100644
--- a/tools/icheck/ichecklib/ichecklib_global.h
+++ b/tools/icheck/parser/ichecklib_global.h
@@ -4,7 +4,7 @@
 #include <QtCore/qglobal.h>
 
 
-#ifdef ICHECKTESTBUILD
+#ifdef ICHECK_APP_BUILD
 #  define ICHECKLIBSHARED_EXPORT
 #else
 #  if defined(ICHECKLIB_LIBRARY)
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/CheckUndefinedSymbols.cpp b/tools/icheck/parser/src/libs/cplusplus/CheckUndefinedSymbols.cpp
index 3d99353395..3d99353395 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/CheckUndefinedSymbols.cpp
+++ b/tools/icheck/parser/src/libs/cplusplus/CheckUndefinedSymbols.cpp
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/CheckUndefinedSymbols.h b/tools/icheck/parser/src/libs/cplusplus/CheckUndefinedSymbols.h
index c8569bd210..c8569bd210 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/CheckUndefinedSymbols.h
+++ b/tools/icheck/parser/src/libs/cplusplus/CheckUndefinedSymbols.h
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/CppBindings.cpp b/tools/icheck/parser/src/libs/cplusplus/CppBindings.cpp
index 5f5d9a77d0..5f5d9a77d0 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/CppBindings.cpp
+++ b/tools/icheck/parser/src/libs/cplusplus/CppBindings.cpp
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/CppBindings.h b/tools/icheck/parser/src/libs/cplusplus/CppBindings.h
index 41ed9638c7..41ed9638c7 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/CppBindings.h
+++ b/tools/icheck/parser/src/libs/cplusplus/CppBindings.h
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/CppDocument.cpp b/tools/icheck/parser/src/libs/cplusplus/CppDocument.cpp
index de81ec3dc0..de81ec3dc0 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/CppDocument.cpp
+++ b/tools/icheck/parser/src/libs/cplusplus/CppDocument.cpp
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/CppDocument.h b/tools/icheck/parser/src/libs/cplusplus/CppDocument.h
index e42ac52bb6..e42ac52bb6 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/CppDocument.h
+++ b/tools/icheck/parser/src/libs/cplusplus/CppDocument.h
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/FastPreprocessor.cpp b/tools/icheck/parser/src/libs/cplusplus/FastPreprocessor.cpp
index 78de8d1b42..78de8d1b42 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/FastPreprocessor.cpp
+++ b/tools/icheck/parser/src/libs/cplusplus/FastPreprocessor.cpp
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/FastPreprocessor.h b/tools/icheck/parser/src/libs/cplusplus/FastPreprocessor.h
index ebbc8d1752..ebbc8d1752 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/FastPreprocessor.h
+++ b/tools/icheck/parser/src/libs/cplusplus/FastPreprocessor.h
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/GenTemplateInstance.cpp b/tools/icheck/parser/src/libs/cplusplus/GenTemplateInstance.cpp
index 9a57316179..9a57316179 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/GenTemplateInstance.cpp
+++ b/tools/icheck/parser/src/libs/cplusplus/GenTemplateInstance.cpp
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/GenTemplateInstance.h b/tools/icheck/parser/src/libs/cplusplus/GenTemplateInstance.h
index 8db5bd9d93..8db5bd9d93 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/GenTemplateInstance.h
+++ b/tools/icheck/parser/src/libs/cplusplus/GenTemplateInstance.h
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/LookupContext.cpp b/tools/icheck/parser/src/libs/cplusplus/LookupContext.cpp
index 1d8811173b..1d8811173b 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/LookupContext.cpp
+++ b/tools/icheck/parser/src/libs/cplusplus/LookupContext.cpp
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/LookupContext.h b/tools/icheck/parser/src/libs/cplusplus/LookupContext.h
index beb23a833f..beb23a833f 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/LookupContext.h
+++ b/tools/icheck/parser/src/libs/cplusplus/LookupContext.h
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/Macro.cpp b/tools/icheck/parser/src/libs/cplusplus/Macro.cpp
index e7af2db931..e7af2db931 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/Macro.cpp
+++ b/tools/icheck/parser/src/libs/cplusplus/Macro.cpp
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/Macro.h b/tools/icheck/parser/src/libs/cplusplus/Macro.h
index 6e41c034b8..6e41c034b8 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/Macro.h
+++ b/tools/icheck/parser/src/libs/cplusplus/Macro.h
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/NamePrettyPrinter.cpp b/tools/icheck/parser/src/libs/cplusplus/NamePrettyPrinter.cpp
index d6071ccebc..d6071ccebc 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/NamePrettyPrinter.cpp
+++ b/tools/icheck/parser/src/libs/cplusplus/NamePrettyPrinter.cpp
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/NamePrettyPrinter.h b/tools/icheck/parser/src/libs/cplusplus/NamePrettyPrinter.h
index d1d4069625..d1d4069625 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/NamePrettyPrinter.h
+++ b/tools/icheck/parser/src/libs/cplusplus/NamePrettyPrinter.h
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/Overview.cpp b/tools/icheck/parser/src/libs/cplusplus/Overview.cpp
index 6f4483187e..6f4483187e 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/Overview.cpp
+++ b/tools/icheck/parser/src/libs/cplusplus/Overview.cpp
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/Overview.h b/tools/icheck/parser/src/libs/cplusplus/Overview.h
index 756a2307fe..756a2307fe 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/Overview.h
+++ b/tools/icheck/parser/src/libs/cplusplus/Overview.h
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/PreprocessorClient.cpp b/tools/icheck/parser/src/libs/cplusplus/PreprocessorClient.cpp
index 5b57baa7b2..5b57baa7b2 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/PreprocessorClient.cpp
+++ b/tools/icheck/parser/src/libs/cplusplus/PreprocessorClient.cpp
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/PreprocessorClient.h b/tools/icheck/parser/src/libs/cplusplus/PreprocessorClient.h
index d89ce71355..d89ce71355 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/PreprocessorClient.h
+++ b/tools/icheck/parser/src/libs/cplusplus/PreprocessorClient.h
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/PreprocessorEnvironment.cpp b/tools/icheck/parser/src/libs/cplusplus/PreprocessorEnvironment.cpp
index 0bb7b33e5d..0bb7b33e5d 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/PreprocessorEnvironment.cpp
+++ b/tools/icheck/parser/src/libs/cplusplus/PreprocessorEnvironment.cpp
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/PreprocessorEnvironment.h b/tools/icheck/parser/src/libs/cplusplus/PreprocessorEnvironment.h
index e5d2f64f6a..e5d2f64f6a 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/PreprocessorEnvironment.h
+++ b/tools/icheck/parser/src/libs/cplusplus/PreprocessorEnvironment.h
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/ResolveExpression.cpp b/tools/icheck/parser/src/libs/cplusplus/ResolveExpression.cpp
index 5d934707ea..5d934707ea 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/ResolveExpression.cpp
+++ b/tools/icheck/parser/src/libs/cplusplus/ResolveExpression.cpp
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/ResolveExpression.h b/tools/icheck/parser/src/libs/cplusplus/ResolveExpression.h
index 1d613228d8..1d613228d8 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/ResolveExpression.h
+++ b/tools/icheck/parser/src/libs/cplusplus/ResolveExpression.h
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/TypePrettyPrinter.cpp b/tools/icheck/parser/src/libs/cplusplus/TypePrettyPrinter.cpp
index 07717905f9..07717905f9 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/TypePrettyPrinter.cpp
+++ b/tools/icheck/parser/src/libs/cplusplus/TypePrettyPrinter.cpp
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/TypePrettyPrinter.h b/tools/icheck/parser/src/libs/cplusplus/TypePrettyPrinter.h
index 75741aa77c..75741aa77c 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/TypePrettyPrinter.h
+++ b/tools/icheck/parser/src/libs/cplusplus/TypePrettyPrinter.h
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/pp-cctype.h b/tools/icheck/parser/src/libs/cplusplus/pp-cctype.h
index d0e3e743cb..d0e3e743cb 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/pp-cctype.h
+++ b/tools/icheck/parser/src/libs/cplusplus/pp-cctype.h
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/pp-engine.cpp b/tools/icheck/parser/src/libs/cplusplus/pp-engine.cpp
index 7b9ad5ec41..7b9ad5ec41 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/pp-engine.cpp
+++ b/tools/icheck/parser/src/libs/cplusplus/pp-engine.cpp
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/pp-engine.h b/tools/icheck/parser/src/libs/cplusplus/pp-engine.h
index 596a223e05..596a223e05 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/pp-engine.h
+++ b/tools/icheck/parser/src/libs/cplusplus/pp-engine.h
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/pp-macro-expander.cpp b/tools/icheck/parser/src/libs/cplusplus/pp-macro-expander.cpp
index 3d34ed26ef..3d34ed26ef 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/pp-macro-expander.cpp
+++ b/tools/icheck/parser/src/libs/cplusplus/pp-macro-expander.cpp
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/pp-macro-expander.h b/tools/icheck/parser/src/libs/cplusplus/pp-macro-expander.h
index a14a545d9a..a14a545d9a 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/pp-macro-expander.h
+++ b/tools/icheck/parser/src/libs/cplusplus/pp-macro-expander.h
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/pp-scanner.cpp b/tools/icheck/parser/src/libs/cplusplus/pp-scanner.cpp
index b397fb8431..b397fb8431 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/pp-scanner.cpp
+++ b/tools/icheck/parser/src/libs/cplusplus/pp-scanner.cpp
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/pp-scanner.h b/tools/icheck/parser/src/libs/cplusplus/pp-scanner.h
index a7e0051460..a7e0051460 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/pp-scanner.h
+++ b/tools/icheck/parser/src/libs/cplusplus/pp-scanner.h
diff --git a/tools/icheck/ichecklib/src/libs/cplusplus/pp.h b/tools/icheck/parser/src/libs/cplusplus/pp.h
index efe33d73a1..efe33d73a1 100644
--- a/tools/icheck/ichecklib/src/libs/cplusplus/pp.h
+++ b/tools/icheck/parser/src/libs/cplusplus/pp.h
diff --git a/tools/icheck/ichecklib/src/libs/utils/qtcassert.h b/tools/icheck/parser/src/libs/utils/qtcassert.h
index a03f5f29c7..a03f5f29c7 100644
--- a/tools/icheck/ichecklib/src/libs/utils/qtcassert.h
+++ b/tools/icheck/parser/src/libs/utils/qtcassert.h
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/basefilewizard.cpp b/tools/icheck/parser/src/plugins/coreplugin/basefilewizard.cpp
index 4aef7b4eec..4aef7b4eec 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/basefilewizard.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/basefilewizard.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/basemode.cpp b/tools/icheck/parser/src/plugins/coreplugin/basemode.cpp
index 19a00c359c..19a00c359c 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/basemode.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/basemode.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/core_global.h b/tools/icheck/parser/src/plugins/coreplugin/core_global.h
index 17ab5a1df4..17ab5a1df4 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/core_global.h
+++ b/tools/icheck/parser/src/plugins/coreplugin/core_global.h
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/coreimpl.cpp b/tools/icheck/parser/src/plugins/coreplugin/coreimpl.cpp
index 643cc4c5f0..643cc4c5f0 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/coreimpl.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/coreimpl.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/coreplugin.cpp b/tools/icheck/parser/src/plugins/coreplugin/coreplugin.cpp
index 8b9317fb65..8b9317fb65 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/coreplugin.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/coreplugin.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/editmode.cpp b/tools/icheck/parser/src/plugins/coreplugin/editmode.cpp
index 6ff8aa8099..6ff8aa8099 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/editmode.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/editmode.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/eventfilteringmainwindow.cpp b/tools/icheck/parser/src/plugins/coreplugin/eventfilteringmainwindow.cpp
index 12a4e820de..12a4e820de 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/eventfilteringmainwindow.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/eventfilteringmainwindow.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/fancyactionbar.cpp b/tools/icheck/parser/src/plugins/coreplugin/fancyactionbar.cpp
index bcb75b6dc7..bcb75b6dc7 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/fancyactionbar.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/fancyactionbar.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/fancytabwidget.cpp b/tools/icheck/parser/src/plugins/coreplugin/fancytabwidget.cpp
index 3ee85e84a0..3ee85e84a0 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/fancytabwidget.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/fancytabwidget.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/fileiconprovider.cpp b/tools/icheck/parser/src/plugins/coreplugin/fileiconprovider.cpp
index 5615fb81d9..5615fb81d9 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/fileiconprovider.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/fileiconprovider.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/filemanager.cpp b/tools/icheck/parser/src/plugins/coreplugin/filemanager.cpp
index 24e2178307..24e2178307 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/filemanager.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/filemanager.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/findplaceholder.cpp b/tools/icheck/parser/src/plugins/coreplugin/findplaceholder.cpp
index 26329b847d..26329b847d 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/findplaceholder.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/findplaceholder.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/flowlayout.cpp b/tools/icheck/parser/src/plugins/coreplugin/flowlayout.cpp
index d60850fc44..d60850fc44 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/flowlayout.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/flowlayout.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/generalsettings.cpp b/tools/icheck/parser/src/plugins/coreplugin/generalsettings.cpp
index 319f4d225c..319f4d225c 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/generalsettings.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/generalsettings.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/icore.cpp b/tools/icheck/parser/src/plugins/coreplugin/icore.cpp
index 82a5c8ce4a..82a5c8ce4a 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/icore.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/icore.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/inavigationwidgetfactory.cpp b/tools/icheck/parser/src/plugins/coreplugin/inavigationwidgetfactory.cpp
index 74cd93cde4..74cd93cde4 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/inavigationwidgetfactory.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/inavigationwidgetfactory.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/mainwindow.cpp b/tools/icheck/parser/src/plugins/coreplugin/mainwindow.cpp
index a8b37fc0d5..a8b37fc0d5 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/mainwindow.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/mainwindow.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/manhattanstyle.cpp b/tools/icheck/parser/src/plugins/coreplugin/manhattanstyle.cpp
index 76e2b2008c..76e2b2008c 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/manhattanstyle.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/messagemanager.cpp b/tools/icheck/parser/src/plugins/coreplugin/messagemanager.cpp
index 05ffdd65c7..05ffdd65c7 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/messagemanager.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/messagemanager.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/messageoutputwindow.cpp b/tools/icheck/parser/src/plugins/coreplugin/messageoutputwindow.cpp
index b86fd026b0..b86fd026b0 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/messageoutputwindow.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/messageoutputwindow.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/mimedatabase.cpp b/tools/icheck/parser/src/plugins/coreplugin/mimedatabase.cpp
index 646a0b4971..646a0b4971 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/mimedatabase.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/mimedatabase.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/minisplitter.cpp b/tools/icheck/parser/src/plugins/coreplugin/minisplitter.cpp
index 25b00d4f7b..25b00d4f7b 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/minisplitter.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/minisplitter.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/modemanager.cpp b/tools/icheck/parser/src/plugins/coreplugin/modemanager.cpp
index df9d41d01c..df9d41d01c 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/modemanager.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/modemanager.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/navigationwidget.cpp b/tools/icheck/parser/src/plugins/coreplugin/navigationwidget.cpp
index 9c43df4eb8..9c43df4eb8 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/navigationwidget.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/navigationwidget.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/outputpane.cpp b/tools/icheck/parser/src/plugins/coreplugin/outputpane.cpp
index 01cbaca2b5..01cbaca2b5 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/outputpane.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/outputpane.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/plugindialog.cpp b/tools/icheck/parser/src/plugins/coreplugin/plugindialog.cpp
index 51c5824489..51c5824489 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/plugindialog.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/plugindialog.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/rightpane.cpp b/tools/icheck/parser/src/plugins/coreplugin/rightpane.cpp
index 78f21dc7dd..78f21dc7dd 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/rightpane.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/rightpane.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/settingsdatabase.cpp b/tools/icheck/parser/src/plugins/coreplugin/settingsdatabase.cpp
index 0203036345..0203036345 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/settingsdatabase.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/settingsdatabase.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/sidebar.cpp b/tools/icheck/parser/src/plugins/coreplugin/sidebar.cpp
index d595928ab3..d595928ab3 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/sidebar.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/sidebar.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/statusbarmanager.cpp b/tools/icheck/parser/src/plugins/coreplugin/statusbarmanager.cpp
index 687fcca2b9..687fcca2b9 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/statusbarmanager.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/statusbarmanager.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/statusbarwidget.cpp b/tools/icheck/parser/src/plugins/coreplugin/statusbarwidget.cpp
index d88837008b..d88837008b 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/statusbarwidget.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/statusbarwidget.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/styleanimator.cpp b/tools/icheck/parser/src/plugins/coreplugin/styleanimator.cpp
index 14de4e2ab1..14de4e2ab1 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/styleanimator.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/styleanimator.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/tabpositionindicator.cpp b/tools/icheck/parser/src/plugins/coreplugin/tabpositionindicator.cpp
index 7fc949a4ae..7fc949a4ae 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/tabpositionindicator.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/tabpositionindicator.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/uniqueidmanager.cpp b/tools/icheck/parser/src/plugins/coreplugin/uniqueidmanager.cpp
index 3b36d88e6d..3b36d88e6d 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/uniqueidmanager.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/uniqueidmanager.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/variablemanager.cpp b/tools/icheck/parser/src/plugins/coreplugin/variablemanager.cpp
index 73492b2a66..73492b2a66 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/variablemanager.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/variablemanager.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/vcsmanager.cpp b/tools/icheck/parser/src/plugins/coreplugin/vcsmanager.cpp
index d9fd831836..d9fd831836 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/vcsmanager.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/vcsmanager.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/coreplugin/versiondialog.cpp b/tools/icheck/parser/src/plugins/coreplugin/versiondialog.cpp
index d951d171bf..d951d171bf 100644
--- a/tools/icheck/ichecklib/src/plugins/coreplugin/versiondialog.cpp
+++ b/tools/icheck/parser/src/plugins/coreplugin/versiondialog.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/cpptools/cppmodelmanager.cpp b/tools/icheck/parser/src/plugins/cpptools/cppmodelmanager.cpp
index 0d7872dc8b..0d7872dc8b 100644
--- a/tools/icheck/ichecklib/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/tools/icheck/parser/src/plugins/cpptools/cppmodelmanager.cpp
diff --git a/tools/icheck/ichecklib/src/plugins/cpptools/cppmodelmanager.h b/tools/icheck/parser/src/plugins/cpptools/cppmodelmanager.h
index 5b8b2bd674..5b8b2bd674 100644
--- a/tools/icheck/ichecklib/src/plugins/cpptools/cppmodelmanager.h
+++ b/tools/icheck/parser/src/plugins/cpptools/cppmodelmanager.h
diff --git a/tools/icheck/ichecklib/src/plugins/cpptools/cppmodelmanagerinterface.h b/tools/icheck/parser/src/plugins/cpptools/cppmodelmanagerinterface.h
index 18b991e941..18b991e941 100644
--- a/tools/icheck/ichecklib/src/plugins/cpptools/cppmodelmanagerinterface.h
+++ b/tools/icheck/parser/src/plugins/cpptools/cppmodelmanagerinterface.h
diff --git a/tools/icheck/ichecklib/src/plugins/cpptools/cpptools_global.h b/tools/icheck/parser/src/plugins/cpptools/cpptools_global.h
index b57f94c4fd..b57f94c4fd 100644
--- a/tools/icheck/ichecklib/src/plugins/cpptools/cpptools_global.h
+++ b/tools/icheck/parser/src/plugins/cpptools/cpptools_global.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/AST.cpp b/tools/icheck/parser/src/shared/cplusplus/AST.cpp
index d394fa3694..d394fa3694 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/AST.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/AST.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/AST.h b/tools/icheck/parser/src/shared/cplusplus/AST.h
index 8bbd9fe989..8bbd9fe989 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/AST.h
+++ b/tools/icheck/parser/src/shared/cplusplus/AST.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/ASTMatch0.cpp b/tools/icheck/parser/src/shared/cplusplus/ASTMatch0.cpp
index 1d329a856a..1d329a856a 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/ASTMatch0.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/ASTMatch0.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/ASTMatcher.cpp b/tools/icheck/parser/src/shared/cplusplus/ASTMatcher.cpp
index 73decce350..73decce350 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/ASTMatcher.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/ASTMatcher.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/ASTMatcher.h b/tools/icheck/parser/src/shared/cplusplus/ASTMatcher.h
index 065ee66359..065ee66359 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/ASTMatcher.h
+++ b/tools/icheck/parser/src/shared/cplusplus/ASTMatcher.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/ASTVisit.cpp b/tools/icheck/parser/src/shared/cplusplus/ASTVisit.cpp
index 4b08ea6375..4b08ea6375 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/ASTVisit.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/ASTVisit.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/ASTVisitor.cpp b/tools/icheck/parser/src/shared/cplusplus/ASTVisitor.cpp
index 4f93c06d0a..4f93c06d0a 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/ASTVisitor.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/ASTVisitor.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/ASTVisitor.h b/tools/icheck/parser/src/shared/cplusplus/ASTVisitor.h
index 701abd80c8..701abd80c8 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/ASTVisitor.h
+++ b/tools/icheck/parser/src/shared/cplusplus/ASTVisitor.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/ASTfwd.h b/tools/icheck/parser/src/shared/cplusplus/ASTfwd.h
index e38739c01e..e38739c01e 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/ASTfwd.h
+++ b/tools/icheck/parser/src/shared/cplusplus/ASTfwd.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Array.cpp b/tools/icheck/parser/src/shared/cplusplus/Array.cpp
index 330474e7b3..330474e7b3 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Array.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/Array.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Array.h b/tools/icheck/parser/src/shared/cplusplus/Array.h
index d8da74a071..d8da74a071 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Array.h
+++ b/tools/icheck/parser/src/shared/cplusplus/Array.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/CPlusPlusForwardDeclarations.h b/tools/icheck/parser/src/shared/cplusplus/CPlusPlusForwardDeclarations.h
index caa90a5523..caa90a5523 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/CPlusPlusForwardDeclarations.h
+++ b/tools/icheck/parser/src/shared/cplusplus/CPlusPlusForwardDeclarations.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/CheckDeclaration.cpp b/tools/icheck/parser/src/shared/cplusplus/CheckDeclaration.cpp
index c6f747d3dd..c6f747d3dd 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/CheckDeclaration.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/CheckDeclaration.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/CheckDeclaration.h b/tools/icheck/parser/src/shared/cplusplus/CheckDeclaration.h
index 0090a1d670..0090a1d670 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/CheckDeclaration.h
+++ b/tools/icheck/parser/src/shared/cplusplus/CheckDeclaration.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/CheckDeclarator.cpp b/tools/icheck/parser/src/shared/cplusplus/CheckDeclarator.cpp
index d87b099790..d87b099790 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/CheckDeclarator.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/CheckDeclarator.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/CheckDeclarator.h b/tools/icheck/parser/src/shared/cplusplus/CheckDeclarator.h
index 81d6c0e4f5..81d6c0e4f5 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/CheckDeclarator.h
+++ b/tools/icheck/parser/src/shared/cplusplus/CheckDeclarator.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/CheckExpression.cpp b/tools/icheck/parser/src/shared/cplusplus/CheckExpression.cpp
index f8da07534c..f8da07534c 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/CheckExpression.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/CheckExpression.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/CheckExpression.h b/tools/icheck/parser/src/shared/cplusplus/CheckExpression.h
index 8085731df5..8085731df5 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/CheckExpression.h
+++ b/tools/icheck/parser/src/shared/cplusplus/CheckExpression.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/CheckName.cpp b/tools/icheck/parser/src/shared/cplusplus/CheckName.cpp
index 26fa9c21ee..26fa9c21ee 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/CheckName.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/CheckName.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/CheckName.h b/tools/icheck/parser/src/shared/cplusplus/CheckName.h
index 1484cb7848..1484cb7848 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/CheckName.h
+++ b/tools/icheck/parser/src/shared/cplusplus/CheckName.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/CheckSpecifier.cpp b/tools/icheck/parser/src/shared/cplusplus/CheckSpecifier.cpp
index 5b32762c69..5b32762c69 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/CheckSpecifier.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/CheckSpecifier.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/CheckSpecifier.h b/tools/icheck/parser/src/shared/cplusplus/CheckSpecifier.h
index 4a46d90174..4a46d90174 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/CheckSpecifier.h
+++ b/tools/icheck/parser/src/shared/cplusplus/CheckSpecifier.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/CheckStatement.cpp b/tools/icheck/parser/src/shared/cplusplus/CheckStatement.cpp
index 878d3fbbeb..878d3fbbeb 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/CheckStatement.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/CheckStatement.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/CheckStatement.h b/tools/icheck/parser/src/shared/cplusplus/CheckStatement.h
index 5c1b1ff02d..5c1b1ff02d 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/CheckStatement.h
+++ b/tools/icheck/parser/src/shared/cplusplus/CheckStatement.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Control.cpp b/tools/icheck/parser/src/shared/cplusplus/Control.cpp
index bc8cb2f877..bc8cb2f877 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Control.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/Control.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Control.h b/tools/icheck/parser/src/shared/cplusplus/Control.h
index a0aa165eec..a0aa165eec 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Control.h
+++ b/tools/icheck/parser/src/shared/cplusplus/Control.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/CoreTypes.cpp b/tools/icheck/parser/src/shared/cplusplus/CoreTypes.cpp
index 43d9f8bab0..43d9f8bab0 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/CoreTypes.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/CoreTypes.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/CoreTypes.h b/tools/icheck/parser/src/shared/cplusplus/CoreTypes.h
index 42d69b4cb3..42d69b4cb3 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/CoreTypes.h
+++ b/tools/icheck/parser/src/shared/cplusplus/CoreTypes.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/DiagnosticClient.cpp b/tools/icheck/parser/src/shared/cplusplus/DiagnosticClient.cpp
index ed5573d632..ed5573d632 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/DiagnosticClient.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/DiagnosticClient.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/DiagnosticClient.h b/tools/icheck/parser/src/shared/cplusplus/DiagnosticClient.h
index 2c1434cbaf..2c1434cbaf 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/DiagnosticClient.h
+++ b/tools/icheck/parser/src/shared/cplusplus/DiagnosticClient.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/FullySpecifiedType.cpp b/tools/icheck/parser/src/shared/cplusplus/FullySpecifiedType.cpp
index a1485db9fc..a1485db9fc 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/FullySpecifiedType.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/FullySpecifiedType.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/FullySpecifiedType.h b/tools/icheck/parser/src/shared/cplusplus/FullySpecifiedType.h
index a557f4e839..a557f4e839 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/FullySpecifiedType.h
+++ b/tools/icheck/parser/src/shared/cplusplus/FullySpecifiedType.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Keywords.cpp b/tools/icheck/parser/src/shared/cplusplus/Keywords.cpp
index 51757eb8c8..51757eb8c8 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Keywords.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/Keywords.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Lexer.cpp b/tools/icheck/parser/src/shared/cplusplus/Lexer.cpp
index 8d806471f2..8d806471f2 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Lexer.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/Lexer.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Lexer.h b/tools/icheck/parser/src/shared/cplusplus/Lexer.h
index 2af593604d..2af593604d 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Lexer.h
+++ b/tools/icheck/parser/src/shared/cplusplus/Lexer.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/LiteralTable.cpp b/tools/icheck/parser/src/shared/cplusplus/LiteralTable.cpp
index 32231266e1..32231266e1 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/LiteralTable.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/LiteralTable.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/LiteralTable.h b/tools/icheck/parser/src/shared/cplusplus/LiteralTable.h
index 408db39053..408db39053 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/LiteralTable.h
+++ b/tools/icheck/parser/src/shared/cplusplus/LiteralTable.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Literals.cpp b/tools/icheck/parser/src/shared/cplusplus/Literals.cpp
index dd5acd25e0..dd5acd25e0 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Literals.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/Literals.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Literals.h b/tools/icheck/parser/src/shared/cplusplus/Literals.h
index 7f380ed086..7f380ed086 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Literals.h
+++ b/tools/icheck/parser/src/shared/cplusplus/Literals.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/MemoryPool.cpp b/tools/icheck/parser/src/shared/cplusplus/MemoryPool.cpp
index 4e0004f0a1..4e0004f0a1 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/MemoryPool.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/MemoryPool.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/MemoryPool.h b/tools/icheck/parser/src/shared/cplusplus/MemoryPool.h
index 25ef445d73..25ef445d73 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/MemoryPool.h
+++ b/tools/icheck/parser/src/shared/cplusplus/MemoryPool.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Name.cpp b/tools/icheck/parser/src/shared/cplusplus/Name.cpp
index b185409cf6..b185409cf6 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Name.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/Name.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Name.h b/tools/icheck/parser/src/shared/cplusplus/Name.h
index ea740bd249..ea740bd249 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Name.h
+++ b/tools/icheck/parser/src/shared/cplusplus/Name.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/NameVisitor.cpp b/tools/icheck/parser/src/shared/cplusplus/NameVisitor.cpp
index fe9d5cda09..fe9d5cda09 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/NameVisitor.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/NameVisitor.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/NameVisitor.h b/tools/icheck/parser/src/shared/cplusplus/NameVisitor.h
index d567c30be8..d567c30be8 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/NameVisitor.h
+++ b/tools/icheck/parser/src/shared/cplusplus/NameVisitor.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Names.cpp b/tools/icheck/parser/src/shared/cplusplus/Names.cpp
index 79196da173..79196da173 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Names.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/Names.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Names.h b/tools/icheck/parser/src/shared/cplusplus/Names.h
index 9ce31a9b60..9ce31a9b60 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Names.h
+++ b/tools/icheck/parser/src/shared/cplusplus/Names.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/ObjectiveCAtKeywords.cpp b/tools/icheck/parser/src/shared/cplusplus/ObjectiveCAtKeywords.cpp
index 141e798ab7..141e798ab7 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/ObjectiveCAtKeywords.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/ObjectiveCAtKeywords.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp b/tools/icheck/parser/src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp
index 654ce88104..654ce88104 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/ObjectiveCTypeQualifiers.h b/tools/icheck/parser/src/shared/cplusplus/ObjectiveCTypeQualifiers.h
index 731dd9c6af..731dd9c6af 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/ObjectiveCTypeQualifiers.h
+++ b/tools/icheck/parser/src/shared/cplusplus/ObjectiveCTypeQualifiers.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Parser.cpp b/tools/icheck/parser/src/shared/cplusplus/Parser.cpp
index 72a259ecd7..72a259ecd7 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Parser.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/Parser.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Parser.h b/tools/icheck/parser/src/shared/cplusplus/Parser.h
index 62e1a69418..62e1a69418 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Parser.h
+++ b/tools/icheck/parser/src/shared/cplusplus/Parser.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Scope.cpp b/tools/icheck/parser/src/shared/cplusplus/Scope.cpp
index 9743e98e44..9743e98e44 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Scope.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/Scope.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Scope.h b/tools/icheck/parser/src/shared/cplusplus/Scope.h
index 25df03a25e..25df03a25e 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Scope.h
+++ b/tools/icheck/parser/src/shared/cplusplus/Scope.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Semantic.cpp b/tools/icheck/parser/src/shared/cplusplus/Semantic.cpp
index 57ac5fe99f..57ac5fe99f 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Semantic.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/Semantic.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Semantic.h b/tools/icheck/parser/src/shared/cplusplus/Semantic.h
index 6ca0b81c70..6ca0b81c70 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Semantic.h
+++ b/tools/icheck/parser/src/shared/cplusplus/Semantic.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/SemanticCheck.cpp b/tools/icheck/parser/src/shared/cplusplus/SemanticCheck.cpp
index b28c01636b..b28c01636b 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/SemanticCheck.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/SemanticCheck.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/SemanticCheck.h b/tools/icheck/parser/src/shared/cplusplus/SemanticCheck.h
index 64523d903c..64523d903c 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/SemanticCheck.h
+++ b/tools/icheck/parser/src/shared/cplusplus/SemanticCheck.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Symbol.cpp b/tools/icheck/parser/src/shared/cplusplus/Symbol.cpp
index 432f5059ac..432f5059ac 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Symbol.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/Symbol.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Symbol.h b/tools/icheck/parser/src/shared/cplusplus/Symbol.h
index 5881f721fd..5881f721fd 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Symbol.h
+++ b/tools/icheck/parser/src/shared/cplusplus/Symbol.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/SymbolVisitor.cpp b/tools/icheck/parser/src/shared/cplusplus/SymbolVisitor.cpp
index de2a5f7eaf..de2a5f7eaf 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/SymbolVisitor.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/SymbolVisitor.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/SymbolVisitor.h b/tools/icheck/parser/src/shared/cplusplus/SymbolVisitor.h
index 3c5df965ea..3c5df965ea 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/SymbolVisitor.h
+++ b/tools/icheck/parser/src/shared/cplusplus/SymbolVisitor.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Symbols.cpp b/tools/icheck/parser/src/shared/cplusplus/Symbols.cpp
index ca20980d99..ca20980d99 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Symbols.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/Symbols.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Symbols.h b/tools/icheck/parser/src/shared/cplusplus/Symbols.h
index c1a1f37926..c1a1f37926 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Symbols.h
+++ b/tools/icheck/parser/src/shared/cplusplus/Symbols.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Token.cpp b/tools/icheck/parser/src/shared/cplusplus/Token.cpp
index 61c22b7cb2..61c22b7cb2 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Token.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/Token.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Token.h b/tools/icheck/parser/src/shared/cplusplus/Token.h
index 1a24eb52b6..1a24eb52b6 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Token.h
+++ b/tools/icheck/parser/src/shared/cplusplus/Token.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/TranslationUnit.cpp b/tools/icheck/parser/src/shared/cplusplus/TranslationUnit.cpp
index 0e0f87acd4..0e0f87acd4 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/TranslationUnit.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/TranslationUnit.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/TranslationUnit.h b/tools/icheck/parser/src/shared/cplusplus/TranslationUnit.h
index b10a4f3f3f..b10a4f3f3f 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/TranslationUnit.h
+++ b/tools/icheck/parser/src/shared/cplusplus/TranslationUnit.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Type.cpp b/tools/icheck/parser/src/shared/cplusplus/Type.cpp
index 9d5d5f6ed3..9d5d5f6ed3 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Type.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/Type.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/Type.h b/tools/icheck/parser/src/shared/cplusplus/Type.h
index a64a824d4e..a64a824d4e 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/Type.h
+++ b/tools/icheck/parser/src/shared/cplusplus/Type.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/TypeMatcher.cpp b/tools/icheck/parser/src/shared/cplusplus/TypeMatcher.cpp
index 599ca60298..599ca60298 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/TypeMatcher.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/TypeMatcher.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/TypeMatcher.h b/tools/icheck/parser/src/shared/cplusplus/TypeMatcher.h
index 50a7871cdd..50a7871cdd 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/TypeMatcher.h
+++ b/tools/icheck/parser/src/shared/cplusplus/TypeMatcher.h
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/TypeVisitor.cpp b/tools/icheck/parser/src/shared/cplusplus/TypeVisitor.cpp
index 4c795c96e0..4c795c96e0 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/TypeVisitor.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/TypeVisitor.cpp
diff --git a/tools/icheck/ichecklib/src/shared/cplusplus/TypeVisitor.h b/tools/icheck/parser/src/shared/cplusplus/TypeVisitor.h
index 99b1df06e1..99b1df06e1 100644
--- a/tools/icheck/ichecklib/src/shared/cplusplus/TypeVisitor.h
+++ b/tools/icheck/parser/src/shared/cplusplus/TypeVisitor.h