Fix icheck's conflicting header file on Symbian

23 files changed, 24 insertions, 24 deletions

diff --git a/tools/icheck/parsemanager.cpp b/tools/icheck/parsemanager.cpp
index 2e57243062..2a619757e5 100644
--- a/tools/icheck/parsemanager.cpp
+++ b/tools/icheck/parsemanager.cpp
@@ -41,7 +41,7 @@
 
 #include "parsemanager.h"
 #include "cplusplus/CppDocument.h"
-#include "./parser/src/shared/cplusplus/Control.h"
+#include "./parser/src/shared/cplusplus/CppControl.h"
 #include "TranslationUnit.h"
 #include "AST.h"
 #include "Symbols.h"
diff --git a/tools/icheck/parser/ichecklib.pri b/tools/icheck/parser/ichecklib.pri
index 35c15d891f..608cdbacc8 100644
--- a/tools/icheck/parser/ichecklib.pri
+++ b/tools/icheck/parser/ichecklib.pri
@@ -11,7 +11,7 @@ HEADERS += $$REL_PATH_TO_SRC/shared/cplusplus/Array.h \
     $$REL_PATH_TO_SRC/shared/cplusplus/CheckName.h \
     $$REL_PATH_TO_SRC/shared/cplusplus/CheckSpecifier.h \
     $$REL_PATH_TO_SRC/shared/cplusplus/CheckStatement.h \
-    $$REL_PATH_TO_SRC/shared/cplusplus/Control.h \
+    $$REL_PATH_TO_SRC/shared/cplusplus/CppControl.h \
     $$REL_PATH_TO_SRC/plugins/coreplugin/core_global.h \
     $$REL_PATH_TO_SRC/shared/cplusplus/CoreTypes.h \
     $$REL_PATH_TO_SRC/shared/cplusplus/CPlusPlusForwardDeclarations.h \
@@ -71,7 +71,7 @@ SOURCES += $$REL_PATH_TO_SRC/shared/cplusplus/Array.cpp \
     $$REL_PATH_TO_SRC/shared/cplusplus/CheckName.cpp \
     $$REL_PATH_TO_SRC/shared/cplusplus/CheckSpecifier.cpp \
     $$REL_PATH_TO_SRC/shared/cplusplus/CheckStatement.cpp \
-    $$REL_PATH_TO_SRC/shared/cplusplus/Control.cpp \
+    $$REL_PATH_TO_SRC/shared/cplusplus/CppControl.cpp \
     $$REL_PATH_TO_SRC/shared/cplusplus/CoreTypes.cpp \
     $$REL_PATH_TO_SRC/libs/cplusplus/CppBindings.cpp \
     $$REL_PATH_TO_SRC/libs/cplusplus/CppDocument.cpp \
diff --git a/tools/icheck/parser/src/libs/cplusplus/CppBindings.cpp b/tools/icheck/parser/src/libs/cplusplus/CppBindings.cpp
index 9c9d42976e..4d9449daa8 100644
--- a/tools/icheck/parser/src/libs/cplusplus/CppBindings.cpp
+++ b/tools/icheck/parser/src/libs/cplusplus/CppBindings.cpp
@@ -48,7 +48,7 @@
 #include <Literals.h>
 #include <Names.h>
 #include <Scope.h>
-#include <Control.h>
+#include <CppControl.h>
 #include <SymbolVisitor.h>
 
 #include <QtDebug>
diff --git a/tools/icheck/parser/src/libs/cplusplus/CppDocument.cpp b/tools/icheck/parser/src/libs/cplusplus/CppDocument.cpp
index ec2d2dd8ae..62929e37ba 100644
--- a/tools/icheck/parser/src/libs/cplusplus/CppDocument.cpp
+++ b/tools/icheck/parser/src/libs/cplusplus/CppDocument.cpp
@@ -43,7 +43,7 @@
 #include "CppBindings.h"
 #include "FastPreprocessor.h"
 
-#include <Control.h>
+#include <CppControl.h>
 #include <TranslationUnit.h>
 #include <DiagnosticClient.h>
 #include <Semantic.h>
diff --git a/tools/icheck/parser/src/libs/cplusplus/FastPreprocessor.h b/tools/icheck/parser/src/libs/cplusplus/FastPreprocessor.h
index f1100fe210..f1094c7936 100644
--- a/tools/icheck/parser/src/libs/cplusplus/FastPreprocessor.h
+++ b/tools/icheck/parser/src/libs/cplusplus/FastPreprocessor.h
@@ -46,7 +46,7 @@
 #include "CppDocument.h"
 #include "pp.h"
 
-#include <Control.h>
+#include <CppControl.h>
 
 #include <QtCore/QSet>
 #include <QtCore/QString>
diff --git a/tools/icheck/parser/src/libs/cplusplus/GenTemplateInstance.cpp b/tools/icheck/parser/src/libs/cplusplus/GenTemplateInstance.cpp
index 740cc3c7eb..4a7825b86c 100644
--- a/tools/icheck/parser/src/libs/cplusplus/GenTemplateInstance.cpp
+++ b/tools/icheck/parser/src/libs/cplusplus/GenTemplateInstance.cpp
@@ -42,7 +42,7 @@
 #include "GenTemplateInstance.h"
 #include "Overview.h"
 
-#include <Control.h>
+#include <CppControl.h>
 #include <Scope.h>
 #include <Names.h>
 #include <Symbols.h>
diff --git a/tools/icheck/parser/src/libs/cplusplus/LookupContext.cpp b/tools/icheck/parser/src/libs/cplusplus/LookupContext.cpp
index 4b36f51978..4b26b347b0 100644
--- a/tools/icheck/parser/src/libs/cplusplus/LookupContext.cpp
+++ b/tools/icheck/parser/src/libs/cplusplus/LookupContext.cpp
@@ -49,7 +49,7 @@
 #include <Literals.h>
 #include <Names.h>
 #include <Scope.h>
-#include <Control.h>
+#include <CppControl.h>
 
 #include <QtDebug>
 
diff --git a/tools/icheck/parser/src/libs/cplusplus/ResolveExpression.cpp b/tools/icheck/parser/src/libs/cplusplus/ResolveExpression.cpp
index a8b26cad3b..138219eeba 100644
--- a/tools/icheck/parser/src/libs/cplusplus/ResolveExpression.cpp
+++ b/tools/icheck/parser/src/libs/cplusplus/ResolveExpression.cpp
@@ -44,7 +44,7 @@
 #include "Overview.h"
 #include "GenTemplateInstance.h"
 
-#include <Control.h>
+#include <CppControl.h>
 #include <AST.h>
 #include <Scope.h>
 #include <Names.h>
diff --git a/tools/icheck/parser/src/shared/cplusplus/ASTVisitor.cpp b/tools/icheck/parser/src/shared/cplusplus/ASTVisitor.cpp
index 8f3f066da3..fc85137b55 100644
--- a/tools/icheck/parser/src/shared/cplusplus/ASTVisitor.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/ASTVisitor.cpp
@@ -61,7 +61,7 @@
 #include "ASTVisitor.h"
 #include "AST.h"
 #include "TranslationUnit.h"
-#include "Control.h"
+#include "CppControl.h"
 
 using namespace CPlusPlus;
 
diff --git a/tools/icheck/parser/src/shared/cplusplus/CheckDeclaration.cpp b/tools/icheck/parser/src/shared/cplusplus/CheckDeclaration.cpp
index 863b554b5b..6d516dd8fd 100644
--- a/tools/icheck/parser/src/shared/cplusplus/CheckDeclaration.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/CheckDeclaration.cpp
@@ -66,7 +66,7 @@
 #include "Names.h"
 #include "CoreTypes.h"
 #include "Symbols.h"
-#include "Control.h"
+#include "CppControl.h"
 #include "Literals.h"
 #include <string>
 #include <cassert>
diff --git a/tools/icheck/parser/src/shared/cplusplus/CheckDeclarator.cpp b/tools/icheck/parser/src/shared/cplusplus/CheckDeclarator.cpp
index 6f330631d0..5e8f88260b 100644
--- a/tools/icheck/parser/src/shared/cplusplus/CheckDeclarator.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/CheckDeclarator.cpp
@@ -61,7 +61,7 @@
 #include "CheckDeclarator.h"
 #include "Semantic.h"
 #include "AST.h"
-#include "Control.h"
+#include "CppControl.h"
 #include "TranslationUnit.h"
 #include "Literals.h"
 #include "CoreTypes.h"
diff --git a/tools/icheck/parser/src/shared/cplusplus/CheckExpression.cpp b/tools/icheck/parser/src/shared/cplusplus/CheckExpression.cpp
index bf40ceae63..ebb40ae9cb 100644
--- a/tools/icheck/parser/src/shared/cplusplus/CheckExpression.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/CheckExpression.cpp
@@ -66,7 +66,7 @@
 #include "Literals.h"
 #include "CoreTypes.h"
 #include "Symbols.h"
-#include "Control.h"
+#include "CppControl.h"
 
 using namespace CPlusPlus;
 
diff --git a/tools/icheck/parser/src/shared/cplusplus/CheckName.cpp b/tools/icheck/parser/src/shared/cplusplus/CheckName.cpp
index 588c4d7431..7db29bd17b 100644
--- a/tools/icheck/parser/src/shared/cplusplus/CheckName.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/CheckName.cpp
@@ -61,7 +61,7 @@
 #include "CheckName.h"
 #include "Semantic.h"
 #include "AST.h"
-#include "Control.h"
+#include "CppControl.h"
 #include "TranslationUnit.h"
 #include "Literals.h"
 #include "Names.h"
diff --git a/tools/icheck/parser/src/shared/cplusplus/CheckSpecifier.cpp b/tools/icheck/parser/src/shared/cplusplus/CheckSpecifier.cpp
index 265786af6b..90ce82b853 100644
--- a/tools/icheck/parser/src/shared/cplusplus/CheckSpecifier.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/CheckSpecifier.cpp
@@ -67,7 +67,7 @@
 #include "Names.h"
 #include "CoreTypes.h"
 #include "Symbols.h"
-#include "Control.h"
+#include "CppControl.h"
 #include "Scope.h"
 
 using namespace CPlusPlus;
diff --git a/tools/icheck/parser/src/shared/cplusplus/CheckStatement.cpp b/tools/icheck/parser/src/shared/cplusplus/CheckStatement.cpp
index 8ae7b5d673..c1206d21f7 100644
--- a/tools/icheck/parser/src/shared/cplusplus/CheckStatement.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/CheckStatement.cpp
@@ -64,7 +64,7 @@
 #include "TranslationUnit.h"
 #include "Scope.h"
 #include "CoreTypes.h"
-#include "Control.h"
+#include "CppControl.h"
 #include "Symbols.h"
 #include "Names.h"
 #include "Literals.h"
diff --git a/tools/icheck/parser/src/shared/cplusplus/Control.cpp b/tools/icheck/parser/src/shared/cplusplus/CppControl.cpp
index 8830a989bf..e9bb77fcdb 100644
--- a/tools/icheck/parser/src/shared/cplusplus/Control.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/CppControl.cpp
@@ -58,7 +58,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include "Control.h"
+#include "CppControl.h"
 #include "Literals.h"
 #include "LiteralTable.h"
 #include "TranslationUnit.h"
diff --git a/tools/icheck/parser/src/shared/cplusplus/Control.h b/tools/icheck/parser/src/shared/cplusplus/CppControl.h
index bb30727e4d..bb30727e4d 100644
--- a/tools/icheck/parser/src/shared/cplusplus/Control.h
+++ b/tools/icheck/parser/src/shared/cplusplus/CppControl.h
diff --git a/tools/icheck/parser/src/shared/cplusplus/Lexer.cpp b/tools/icheck/parser/src/shared/cplusplus/Lexer.cpp
index 3ff9b493b4..52a90066a2 100644
--- a/tools/icheck/parser/src/shared/cplusplus/Lexer.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/Lexer.cpp
@@ -59,7 +59,7 @@
 // THE SOFTWARE.
 
 #include "Lexer.h"
-#include "Control.h"
+#include "CppControl.h"
 #include "TranslationUnit.h"
 #include "Literals.h"
 #include <cctype>
diff --git a/tools/icheck/parser/src/shared/cplusplus/Parser.cpp b/tools/icheck/parser/src/shared/cplusplus/Parser.cpp
index 0dc0865276..2ec005f0a2 100644
--- a/tools/icheck/parser/src/shared/cplusplus/Parser.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/Parser.cpp
@@ -61,7 +61,7 @@
 #include "Parser.h"
 #include "Token.h"
 #include "Lexer.h"
-#include "Control.h"
+#include "CppControl.h"
 #include "AST.h"
 #include "Literals.h"
 #include "ObjectiveCTypeQualifiers.h"
diff --git a/tools/icheck/parser/src/shared/cplusplus/Semantic.cpp b/tools/icheck/parser/src/shared/cplusplus/Semantic.cpp
index 69bd702455..ce7d2b64a8 100644
--- a/tools/icheck/parser/src/shared/cplusplus/Semantic.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/Semantic.cpp
@@ -60,7 +60,7 @@
 
 #include "Semantic.h"
 #include "TranslationUnit.h"
-#include "Control.h"
+#include "CppControl.h"
 #include "Scope.h"
 #include "Symbols.h"
 #include "Token.h"
diff --git a/tools/icheck/parser/src/shared/cplusplus/Symbol.cpp b/tools/icheck/parser/src/shared/cplusplus/Symbol.cpp
index b1528bb3e1..1d1abd7b3a 100644
--- a/tools/icheck/parser/src/shared/cplusplus/Symbol.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/Symbol.cpp
@@ -60,7 +60,7 @@
 
 #include "Symbol.h"
 #include "Symbols.h"
-#include "Control.h"
+#include "CppControl.h"
 #include "Names.h"
 #include "TranslationUnit.h"
 #include "Literals.h"
diff --git a/tools/icheck/parser/src/shared/cplusplus/TranslationUnit.cpp b/tools/icheck/parser/src/shared/cplusplus/TranslationUnit.cpp
index 9c2f0d6167..c70d6fd63f 100644
--- a/tools/icheck/parser/src/shared/cplusplus/TranslationUnit.cpp
+++ b/tools/icheck/parser/src/shared/cplusplus/TranslationUnit.cpp
@@ -59,7 +59,7 @@
 // THE SOFTWARE.
 
 #include "TranslationUnit.h"
-#include "Control.h"
+#include "CppControl.h"
 #include "Parser.h"
 #include "Lexer.h"
 #include "MemoryPool.h"
diff --git a/tools/tools.pro b/tools/tools.pro
index d30724e342..ba62bddbfc 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -3,9 +3,9 @@ include(../staticconfig.pri)
 TEMPLATE = subdirs
 
 contains(mobility_modules,serviceframework) { 
-    SUBDIRS += servicedbgen servicefw servicexmlgen #SFW API
+    SUBDIRS += servicedbgen servicexmlgen icheck #SFW API
     !symbian {
-    	SUBDIRS += icheck # broken headers on tb10.1, temp disable
+    	SUBDIRS += servicefw # not needed for symbian
     }
 }