Cleanup the C++ front-end.

Removed CPLUSPLUS_BEGIN/END_NAMESPACE & co and made it possible to compile the parser with CPLUSPLUS_WITHOUT_QT.

71 files changed, 215 insertions, 237 deletions

diff --git a/src/shared/cplusplus/AST.cpp b/src/shared/cplusplus/AST.cpp
index 21e8a1504c..babf8380c5 100644
--- a/src/shared/cplusplus/AST.cpp
+++ b/src/shared/cplusplus/AST.cpp
@@ -54,7 +54,7 @@
 #include <cstddef>
 #include <algorithm>
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 AST::AST()
 { }
@@ -2493,4 +2493,4 @@ unsigned ObjCSynchronizedStatementAST::lastToken() const
     return synchronized_token + 1;
 }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/AST.h b/src/shared/cplusplus/AST.h
index 4af1971e2e..05a78b0832 100644
--- a/src/shared/cplusplus/AST.h
+++ b/src/shared/cplusplus/AST.h
@@ -53,8 +53,8 @@
 #include "ASTfwd.h"
 #include "MemoryPool.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 template <typename _Tp>
 class List: public Managed
@@ -3168,7 +3168,7 @@ protected:
     virtual void accept0(ASTVisitor *visitor);
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_AST_H
diff --git a/src/shared/cplusplus/ASTClone.cpp b/src/shared/cplusplus/ASTClone.cpp
index e30fb2b43d..444097abfc 100644
--- a/src/shared/cplusplus/ASTClone.cpp
+++ b/src/shared/cplusplus/ASTClone.cpp
@@ -30,7 +30,7 @@
 #include "AST.h"
 #include "ASTVisitor.h"
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 SimpleSpecifierAST *SimpleSpecifierAST::clone(MemoryPool *pool) const
 {
@@ -1516,4 +1516,4 @@ ObjCSynchronizedStatementAST *ObjCSynchronizedStatementAST::clone(MemoryPool *po
 }
 
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/ASTVisit.cpp b/src/shared/cplusplus/ASTVisit.cpp
index d5862271dc..7cd2075399 100644
--- a/src/shared/cplusplus/ASTVisit.cpp
+++ b/src/shared/cplusplus/ASTVisit.cpp
@@ -30,7 +30,7 @@
 #include "AST.h"
 #include "ASTVisitor.h"
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 void SimpleSpecifierAST::accept0(ASTVisitor *visitor)
 {
@@ -1465,4 +1465,4 @@ void ObjCSynchronizedStatementAST::accept0(ASTVisitor *visitor)
     visitor->endVisit(this);
 }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/ASTVisitor.cpp b/src/shared/cplusplus/ASTVisitor.cpp
index 20c261318c..6f331515a0 100644
--- a/src/shared/cplusplus/ASTVisitor.cpp
+++ b/src/shared/cplusplus/ASTVisitor.cpp
@@ -51,7 +51,7 @@
 #include "TranslationUnit.h"
 #include "Control.h"
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 ASTVisitor::ASTVisitor(Control *control)
     : _control(control)
@@ -111,4 +111,4 @@ void ASTVisitor::getTokenStartPosition(unsigned index, unsigned *line, unsigned
 void ASTVisitor::getTokenEndPosition(unsigned index, unsigned *line, unsigned *column) const
 { getPosition(tokenAt(index).end(), line, column); }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/ASTVisitor.h b/src/shared/cplusplus/ASTVisitor.h
index 5c2c85bfc6..7356e0f905 100644
--- a/src/shared/cplusplus/ASTVisitor.h
+++ b/src/shared/cplusplus/ASTVisitor.h
@@ -52,8 +52,8 @@
 #include "CPlusPlusForwardDeclarations.h"
 #include "ASTfwd.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT ASTVisitor
 {
@@ -371,7 +371,7 @@ private:
     Control *_control;
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_ASTVISITOR_H
diff --git a/src/shared/cplusplus/ASTfwd.h b/src/shared/cplusplus/ASTfwd.h
index 5ac42923c6..f97bae2a84 100644
--- a/src/shared/cplusplus/ASTfwd.h
+++ b/src/shared/cplusplus/ASTfwd.h
@@ -51,8 +51,8 @@
 
 #include <CPlusPlusForwardDeclarations.h>
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class AST;
 class ASTVisitor;
@@ -203,7 +203,7 @@ class ObjCDynamicPropertiesDeclarationAST;
 class ObjCFastEnumerationAST;
 class ObjCSynchronizedStatementAST;
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_ASTFWD_H
diff --git a/src/shared/cplusplus/Array.h b/src/shared/cplusplus/Array.h
index 34d2048eee..d749cbec81 100644
--- a/src/shared/cplusplus/Array.h
+++ b/src/shared/cplusplus/Array.h
@@ -53,8 +53,8 @@
 #include <new>
 #include <cstdlib>
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 template <typename _Tp, int SEGMENT_SHIFT = 4>
 class Array
@@ -125,7 +125,7 @@ private:
     int _count;
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_ARRAY_H
diff --git a/src/shared/cplusplus/CPlusPlusForwardDeclarations.h b/src/shared/cplusplus/CPlusPlusForwardDeclarations.h
index b060f11dfa..9e570d2c1a 100644
--- a/src/shared/cplusplus/CPlusPlusForwardDeclarations.h
+++ b/src/shared/cplusplus/CPlusPlusForwardDeclarations.h
@@ -49,34 +49,19 @@
 #ifndef CPLUSPLUS_CPLUSPLUSFORWARDDECLARATIONS_H
 #define CPLUSPLUS_CPLUSPLUSFORWARDDECLARATIONS_H
 
-#ifndef CPLUSPLUS_WITH_NO_QT
+#ifndef CPLUSPLUS_WITHOUT_QT
 #  include <QtCore/qglobal.h>
-#  define CPLUSPLUS_BEGIN_HEADER
-#  define CPLUSPLUS_END_HEADER
+
 #  if defined(CPLUSPLUS_BUILD_LIB)
 #    define CPLUSPLUS_EXPORT Q_DECL_EXPORT
 #  else
 #    define CPLUSPLUS_EXPORT Q_DECL_IMPORT
 #  endif
-#  define CPLUSPLUS_WITH_NAMESPACE
 #else
-#  define CPLUSPLUS_BEGIN_HEADER
-#  define CPLUSPLUS_END_HEADER
 #  define CPLUSPLUS_EXPORT
 #endif
 
-#ifdef CPLUSPLUS_WITH_NAMESPACE
-#  define CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
-#  define CPLUSPLUS_END_NAMESPACE   } // end of namespace CPlusPLus
-#  define CPLUSPLUS_USE_NAMESPACE   using namespace CPlusPlus;
-#else
-#  define CPLUSPLUS_BEGIN_NAMESPACE
-#  define CPLUSPLUS_END_NAMESPACE
-#  define CPLUSPLUS_USE_NAMESPACE   ;
-#endif
-
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+namespace CPlusPlus {
 
 class TranslationUnit;
 class Semantic;
@@ -144,7 +129,6 @@ class ObjCProtocol;
 class ObjCForwardProtocolDeclaration;
 class ObjCMethod;
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
 
 #endif // CPLUSPLUS_CPLUSPLUSFORWARDDECLARATIONS_H
diff --git a/src/shared/cplusplus/CheckDeclaration.cpp b/src/shared/cplusplus/CheckDeclaration.cpp
index b7143797ad..5a0142f384 100644
--- a/src/shared/cplusplus/CheckDeclaration.cpp
+++ b/src/shared/cplusplus/CheckDeclaration.cpp
@@ -57,9 +57,8 @@
 #include "Control.h"
 #include "Literals.h"
 #include <cassert>
-#include <QtCore/QByteArray>
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 CheckDeclaration::CheckDeclaration(Semantic *semantic)
     : SemanticCheck(semantic),
@@ -228,7 +227,6 @@ bool CheckDeclaration::visit(SimpleDeclarationAST *ast)
 
         if (it->declarator && it->declarator->initializer) {
             FullySpecifiedType initTy = semantic()->check(it->declarator->initializer, _scope);
-            Q_UNUSED(initTy)
         }
 
         *decl_it = new (translationUnit()->memoryPool()) List<Declaration *>();
@@ -703,25 +701,25 @@ bool CheckDeclaration::visit(ObjCPropertyDeclarationAST *ast)
             continue;
 
         const char *attrName = spell(attrAst->attribute_identifier_token);
-        if (!qstrcmp("getter", attrName)) {
+        if (!strcmp("getter", attrName)) {
             if (checkPropertyAttribute(attrAst, propAttrs, Getter)) {
                 // TODO: find method declaration for getter
             }
-        } else if (!qstrcmp("setter", attrName)) {
+        } else if (!strcmp("setter", attrName)) {
             if (checkPropertyAttribute(attrAst, propAttrs, Setter)) {
                 // TODO: find method declaration for setter
             }
-        } else if (!qstrcmp("readwrite", attrName)) {
+        } else if (!strcmp("readwrite", attrName)) {
             checkPropertyAttribute(attrAst, propAttrs, ReadWrite);
-        } else if (!qstrcmp("readonly", attrName)) {
+        } else if (!strcmp("readonly", attrName)) {
             checkPropertyAttribute(attrAst, propAttrs, ReadOnly);
-        } else if (!qstrcmp("assign", attrName)) {
+        } else if (!strcmp("assign", attrName)) {
             checkPropertyAttribute(attrAst, propAttrs, Assign);
-        } else if (!qstrcmp("retain", attrName)) {
+        } else if (!strcmp("retain", attrName)) {
             checkPropertyAttribute(attrAst, propAttrs, Retain);
-        } else if (!qstrcmp("copy", attrName)) {
+        } else if (!strcmp("copy", attrName)) {
             checkPropertyAttribute(attrAst, propAttrs, Copy);
-        } else if (!qstrcmp("nonatomic", attrName)) {
+        } else if (!strcmp("nonatomic", attrName)) {
             checkPropertyAttribute(attrAst, propAttrs, NonAtomic);
         }
     }
@@ -745,4 +743,4 @@ bool CheckDeclaration::visit(ObjCPropertyDeclarationAST *ast)
     return false;
 }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/CheckDeclaration.h b/src/shared/cplusplus/CheckDeclaration.h
index fcb773dd0e..0e11a5398b 100644
--- a/src/shared/cplusplus/CheckDeclaration.h
+++ b/src/shared/cplusplus/CheckDeclaration.h
@@ -52,8 +52,8 @@
 #include "CPlusPlusForwardDeclarations.h"
 #include "SemanticCheck.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT CheckDeclaration: public SemanticCheck
 {
@@ -111,7 +111,7 @@ private:
     bool _checkAnonymousArguments: 1;
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_CHECKDECLARATION_H
diff --git a/src/shared/cplusplus/CheckDeclarator.cpp b/src/shared/cplusplus/CheckDeclarator.cpp
index 5867d6180a..b44c90f955 100644
--- a/src/shared/cplusplus/CheckDeclarator.cpp
+++ b/src/shared/cplusplus/CheckDeclarator.cpp
@@ -55,7 +55,7 @@
 #include "CoreTypes.h"
 #include "Symbols.h"
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 CheckDeclarator::CheckDeclarator(Semantic *semantic)
     : SemanticCheck(semantic),
@@ -300,4 +300,4 @@ void CheckDeclarator::applyCvQualifiers(SpecifierAST *cv)
     }
 }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/CheckDeclarator.h b/src/shared/cplusplus/CheckDeclarator.h
index 2f4ba6ba91..b676abfacd 100644
--- a/src/shared/cplusplus/CheckDeclarator.h
+++ b/src/shared/cplusplus/CheckDeclarator.h
@@ -53,8 +53,8 @@
 #include "SemanticCheck.h"
 #include "FullySpecifiedType.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT CheckDeclarator: public SemanticCheck
 {
@@ -106,7 +106,7 @@ private:
     FullySpecifiedType _fullySpecifiedType;
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_CHECKDECLARATOR_H
diff --git a/src/shared/cplusplus/CheckExpression.cpp b/src/shared/cplusplus/CheckExpression.cpp
index 805975b625..02263d6b82 100644
--- a/src/shared/cplusplus/CheckExpression.cpp
+++ b/src/shared/cplusplus/CheckExpression.cpp
@@ -56,7 +56,7 @@
 #include "Symbols.h"
 #include "Control.h"
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 CheckExpression::CheckExpression(Semantic *semantic)
     : SemanticCheck(semantic),
@@ -207,7 +207,6 @@ bool CheckExpression::visit(NewExpressionAST *ast)
     if (ast->new_placement) {
         for (ExpressionListAST *it = ast->new_placement->expression_list; it; it = it->next) {
             FullySpecifiedType exprTy = semantic()->check(it->expression, _scope);
-            Q_UNUSED(exprTy)
         }
     }
 
@@ -215,18 +214,15 @@ bool CheckExpression::visit(NewExpressionAST *ast)
 
     if (ast->new_type_id) {
         FullySpecifiedType ty = semantic()->check(ast->new_type_id->type_specifier, _scope);
-        Q_UNUSED(ty)
 
         for (NewArrayDeclaratorAST *it = ast->new_type_id->new_array_declarators; it; it = it->next) {
             FullySpecifiedType exprTy = semantic()->check(it->expression, _scope);
-            Q_UNUSED(exprTy)
         }
     }
 
     // ### process new-initializer
     if (ast->new_initializer) {
         FullySpecifiedType exprTy = semantic()->check(ast->new_initializer->expression, _scope);
-        Q_UNUSED(exprTy)
     }
 
     return false;
@@ -397,4 +393,4 @@ bool CheckExpression::visit(ObjCSelectorExpressionAST *ast)
     return false;
 }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/CheckExpression.h b/src/shared/cplusplus/CheckExpression.h
index 40cfc09f67..a61371db43 100644
--- a/src/shared/cplusplus/CheckExpression.h
+++ b/src/shared/cplusplus/CheckExpression.h
@@ -53,8 +53,8 @@
 #include "SemanticCheck.h"
 #include "FullySpecifiedType.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT CheckExpression: public SemanticCheck
 {
@@ -122,7 +122,7 @@ private:
     bool _checkOldStyleCasts: 1;
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_CHECKEXPRESSION_H
diff --git a/src/shared/cplusplus/CheckName.cpp b/src/shared/cplusplus/CheckName.cpp
index 4a3e884a47..19e2eedf98 100644
--- a/src/shared/cplusplus/CheckName.cpp
+++ b/src/shared/cplusplus/CheckName.cpp
@@ -58,7 +58,7 @@
 #include "Scope.h"
 #include <cassert>
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 CheckName::CheckName(Semantic *semantic)
     : SemanticCheck(semantic),
@@ -425,4 +425,4 @@ bool CheckName::visit(ObjCMessageArgumentDeclarationAST *ast)
     return false;
 }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/CheckName.h b/src/shared/cplusplus/CheckName.h
index d6fb271d48..ec2b97beea 100644
--- a/src/shared/cplusplus/CheckName.h
+++ b/src/shared/cplusplus/CheckName.h
@@ -52,8 +52,8 @@
 #include "CPlusPlusForwardDeclarations.h"
 #include "SemanticCheck.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT CheckName: public SemanticCheck
 {
@@ -89,7 +89,7 @@ private:
     Scope *_scope;
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_CHECKNAME_H
diff --git a/src/shared/cplusplus/CheckSpecifier.cpp b/src/shared/cplusplus/CheckSpecifier.cpp
index d4de2c5517..6baef4682e 100644
--- a/src/shared/cplusplus/CheckSpecifier.cpp
+++ b/src/shared/cplusplus/CheckSpecifier.cpp
@@ -58,7 +58,7 @@
 #include "Control.h"
 #include "Scope.h"
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 CheckSpecifier::CheckSpecifier(Semantic *semantic)
     : SemanticCheck(semantic),
@@ -420,4 +420,4 @@ bool CheckSpecifier::visit(ObjCTypeNameAST * /*ast*/)
     return true;
 }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/CheckSpecifier.h b/src/shared/cplusplus/CheckSpecifier.h
index 050981b392..9f06a43771 100644
--- a/src/shared/cplusplus/CheckSpecifier.h
+++ b/src/shared/cplusplus/CheckSpecifier.h
@@ -53,8 +53,8 @@
 #include "SemanticCheck.h"
 #include "FullySpecifiedType.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT CheckSpecifier: public SemanticCheck
 {
@@ -88,7 +88,7 @@ private:
     Scope *_scope;
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_CHECKSPECIFIER_H
diff --git a/src/shared/cplusplus/CheckStatement.cpp b/src/shared/cplusplus/CheckStatement.cpp
index 086457f1c4..79a4e2e33d 100644
--- a/src/shared/cplusplus/CheckStatement.cpp
+++ b/src/shared/cplusplus/CheckStatement.cpp
@@ -55,7 +55,7 @@
 #include "Control.h"
 #include "Symbols.h"
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 CheckStatement::CheckStatement(Semantic *semantic)
     : SemanticCheck(semantic),
@@ -307,4 +307,4 @@ bool CheckStatement::visit(WhileStatementAST *ast)
     return false;
 }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/CheckStatement.h b/src/shared/cplusplus/CheckStatement.h
index 087b06928d..6bd0c868ab 100644
--- a/src/shared/cplusplus/CheckStatement.h
+++ b/src/shared/cplusplus/CheckStatement.h
@@ -52,8 +52,8 @@
 #include "CPlusPlusForwardDeclarations.h"
 #include "SemanticCheck.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT CheckStatement: public SemanticCheck
 {
@@ -94,7 +94,7 @@ private:
     Scope *_scope;
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_CHECKSTATEMENT_H
diff --git a/src/shared/cplusplus/Control.cpp b/src/shared/cplusplus/Control.cpp
index 30c5552bbe..908bded134 100644
--- a/src/shared/cplusplus/Control.cpp
+++ b/src/shared/cplusplus/Control.cpp
@@ -57,7 +57,7 @@
 #include <map> // ### replace me with LiteralTable
 #include <string>
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 
 template <typename _Iterator>
@@ -766,4 +766,4 @@ ObjCForwardProtocolDeclaration *Control::newObjCForwardProtocolDeclaration(unsig
 ObjCMethod *Control::newObjCMethod(unsigned sourceLocation, Name *name)
 { return d->newObjCMethod(sourceLocation, name); }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/Control.h b/src/shared/cplusplus/Control.h
index 9a41629fea..615eab38f8 100644
--- a/src/shared/cplusplus/Control.h
+++ b/src/shared/cplusplus/Control.h
@@ -52,8 +52,8 @@
 #include "CPlusPlusForwardDeclarations.h"
 #include <cstddef>
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT Control
 {
@@ -199,7 +199,7 @@ private:
     Data *d;
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_CONTROL_H
diff --git a/src/shared/cplusplus/CoreTypes.cpp b/src/shared/cplusplus/CoreTypes.cpp
index 07a6782908..141ce3dc87 100644
--- a/src/shared/cplusplus/CoreTypes.cpp
+++ b/src/shared/cplusplus/CoreTypes.cpp
@@ -51,7 +51,7 @@
 #include "Names.h"
 #include <algorithm>
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 
 bool VoidType::isEqualTo(const Type *other) const
@@ -230,4 +230,4 @@ bool NamedType::isEqualTo(const Type *other) const
 void NamedType::accept0(TypeVisitor *visitor)
 { visitor->visit(this); }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/CoreTypes.h b/src/shared/cplusplus/CoreTypes.h
index 64e96c174b..67d8a79515 100644
--- a/src/shared/cplusplus/CoreTypes.h
+++ b/src/shared/cplusplus/CoreTypes.h
@@ -54,8 +54,8 @@
 #include "FullySpecifiedType.h"
 #include <cstddef>
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT UndefinedType : public Type
 {
@@ -272,7 +272,7 @@ private:
     Name *_name;
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_CORETYPES_H
diff --git a/src/shared/cplusplus/DiagnosticClient.cpp b/src/shared/cplusplus/DiagnosticClient.cpp
index 8c5d52d91f..ed5573d632 100644
--- a/src/shared/cplusplus/DiagnosticClient.cpp
+++ b/src/shared/cplusplus/DiagnosticClient.cpp
@@ -48,7 +48,7 @@
 
 #include "DiagnosticClient.h"
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 DiagnosticClient::DiagnosticClient()
 { }
@@ -56,4 +56,4 @@ DiagnosticClient::DiagnosticClient()
 DiagnosticClient::~DiagnosticClient()
 { }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/DiagnosticClient.h b/src/shared/cplusplus/DiagnosticClient.h
index d9f9ff53f4..ff83a4c6f9 100644
--- a/src/shared/cplusplus/DiagnosticClient.h
+++ b/src/shared/cplusplus/DiagnosticClient.h
@@ -52,8 +52,8 @@
 #include "CPlusPlusForwardDeclarations.h"
 #include "stdarg.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT DiagnosticClient
 {
@@ -76,7 +76,7 @@ public:
                         const char *format, va_list ap) = 0;
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_DIAGNOSTICCLIENT_H
diff --git a/src/shared/cplusplus/FullySpecifiedType.cpp b/src/shared/cplusplus/FullySpecifiedType.cpp
index 58711ac8a9..578c6c9b7d 100644
--- a/src/shared/cplusplus/FullySpecifiedType.cpp
+++ b/src/shared/cplusplus/FullySpecifiedType.cpp
@@ -50,7 +50,7 @@
 #include "Type.h"
 #include "CoreTypes.h"
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 FullySpecifiedType::FullySpecifiedType(Type *type) :
     _type(type), _flags(0)
@@ -209,4 +209,4 @@ FullySpecifiedType FullySpecifiedType::simplified() const
     return *this;
 }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/FullySpecifiedType.h b/src/shared/cplusplus/FullySpecifiedType.h
index b9a1c3fa39..6c9f83d914 100644
--- a/src/shared/cplusplus/FullySpecifiedType.h
+++ b/src/shared/cplusplus/FullySpecifiedType.h
@@ -51,8 +51,8 @@
 
 #include "CPlusPlusForwardDeclarations.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT FullySpecifiedType
 {
@@ -151,7 +151,7 @@ private:
     };
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_FULLYSPECIFIEDTYPE_H
diff --git a/src/shared/cplusplus/Keywords.cpp b/src/shared/cplusplus/Keywords.cpp
index f620bb745c..48af124473 100644
--- a/src/shared/cplusplus/Keywords.cpp
+++ b/src/shared/cplusplus/Keywords.cpp
@@ -49,7 +49,7 @@
 #include "Lexer.h"
 #include "Token.h"
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 static inline int classify2(const char *s, bool) {
   if (s[0] == 'd') {
@@ -1400,4 +1400,4 @@ int Lexer::classifyOperator(const char *s, int n) {
   } // switch
 }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/Lexer.cpp b/src/shared/cplusplus/Lexer.cpp
index 79c9bf4af1..a0cc9495d8 100644
--- a/src/shared/cplusplus/Lexer.cpp
+++ b/src/shared/cplusplus/Lexer.cpp
@@ -55,7 +55,7 @@
 
 using namespace std;
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 Lexer::Lexer(TranslationUnit *unit)
     : _translationUnit(unit),
@@ -720,4 +720,4 @@ void Lexer::scan_helper(Token *tok)
     } // switch
 }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/Lexer.h b/src/shared/cplusplus/Lexer.h
index 4f2e9e3862..2af593604d 100644
--- a/src/shared/cplusplus/Lexer.h
+++ b/src/shared/cplusplus/Lexer.h
@@ -52,8 +52,8 @@
 #include "CPlusPlusForwardDeclarations.h"
 #include "Token.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT Lexer
 {
@@ -152,7 +152,7 @@ private:
     unsigned _currentLine;
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_LEXER_H
diff --git a/src/shared/cplusplus/LiteralTable.h b/src/shared/cplusplus/LiteralTable.h
index 64fd2e1dac..29de643002 100644
--- a/src/shared/cplusplus/LiteralTable.h
+++ b/src/shared/cplusplus/LiteralTable.h
@@ -53,8 +53,8 @@
 #include <cstring>
 #include <cstdlib>
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 template <typename _Literal>
 class LiteralTable
@@ -185,7 +185,7 @@ protected:
     int _allocatedBuckets;
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_LITERALTABLE_H
diff --git a/src/shared/cplusplus/Literals.cpp b/src/shared/cplusplus/Literals.cpp
index 5175979dfb..40042eb66e 100644
--- a/src/shared/cplusplus/Literals.cpp
+++ b/src/shared/cplusplus/Literals.cpp
@@ -53,7 +53,7 @@
 
 using namespace std;
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 ////////////////////////////////////////////////////////////////////////////////
 Literal::Literal(const char *chars, unsigned size)
@@ -227,4 +227,4 @@ bool Identifier::isEqualTo(const Identifier *other) const
     return ! strcmp(chars(), other->chars());
 }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/Literals.h b/src/shared/cplusplus/Literals.h
index a7cefc76ec..2a11cdada7 100644
--- a/src/shared/cplusplus/Literals.h
+++ b/src/shared/cplusplus/Literals.h
@@ -52,8 +52,8 @@
 #include "CPlusPlusForwardDeclarations.h"
 #include "Token.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT Literal
 {
@@ -135,7 +135,7 @@ public:
     bool isEqualTo(const Identifier *other) const;
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_LITERALS_H
diff --git a/src/shared/cplusplus/MemoryPool.cpp b/src/shared/cplusplus/MemoryPool.cpp
index 90cf499993..2002a65435 100644
--- a/src/shared/cplusplus/MemoryPool.cpp
+++ b/src/shared/cplusplus/MemoryPool.cpp
@@ -51,7 +51,7 @@
 #include <cstring>
 #include <cassert>
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 using namespace std;
 
@@ -125,4 +125,4 @@ void Managed::operator delete(void *)
 void Managed::operator delete(void *, MemoryPool *)
 { }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/MemoryPool.h b/src/shared/cplusplus/MemoryPool.h
index ef802eb359..e0f1ff8701 100644
--- a/src/shared/cplusplus/MemoryPool.h
+++ b/src/shared/cplusplus/MemoryPool.h
@@ -53,8 +53,8 @@
 #include <cstddef>
 #include <new>
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT MemoryPool
 {
@@ -110,7 +110,7 @@ public:
     void operator delete(void *, MemoryPool *);
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_MEMORYPOOL_H
diff --git a/src/shared/cplusplus/Name.cpp b/src/shared/cplusplus/Name.cpp
index bde12732a5..6354382551 100644
--- a/src/shared/cplusplus/Name.cpp
+++ b/src/shared/cplusplus/Name.cpp
@@ -50,7 +50,7 @@
 #include "Names.h"
 #include "NameVisitor.h"
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 Name::Name()
 { }
@@ -93,4 +93,4 @@ void Name::accept(Name *name, NameVisitor *visitor)
     name->accept(visitor);
 }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/Name.h b/src/shared/cplusplus/Name.h
index 1324a08feb..45dfef86e6 100644
--- a/src/shared/cplusplus/Name.h
+++ b/src/shared/cplusplus/Name.h
@@ -51,8 +51,8 @@
 
 #include "CPlusPlusForwardDeclarations.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT Name
 {
@@ -98,7 +98,7 @@ protected:
     virtual void accept0(NameVisitor *visitor) = 0;
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_NAME_H
diff --git a/src/shared/cplusplus/NameVisitor.cpp b/src/shared/cplusplus/NameVisitor.cpp
index 85ae4206ae..29630661d7 100644
--- a/src/shared/cplusplus/NameVisitor.cpp
+++ b/src/shared/cplusplus/NameVisitor.cpp
@@ -49,7 +49,7 @@
 #include "NameVisitor.h"
 #include "Names.h"
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 NameVisitor::NameVisitor()
 { }
@@ -60,4 +60,4 @@ NameVisitor::~NameVisitor()
 void NameVisitor::accept(Name *name)
 { Name::accept(name, this); }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/NameVisitor.h b/src/shared/cplusplus/NameVisitor.h
index 19c2e0efb3..f8889b7d7f 100644
--- a/src/shared/cplusplus/NameVisitor.h
+++ b/src/shared/cplusplus/NameVisitor.h
@@ -51,8 +51,8 @@
 
 #include "CPlusPlusForwardDeclarations.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT NameVisitor
 {
@@ -77,7 +77,7 @@ public:
     virtual void visit(SelectorNameId *) {}
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_NAMEVISITOR_H
diff --git a/src/shared/cplusplus/Names.cpp b/src/shared/cplusplus/Names.cpp
index 0adfaab053..9e60804e77 100644
--- a/src/shared/cplusplus/Names.cpp
+++ b/src/shared/cplusplus/Names.cpp
@@ -52,7 +52,7 @@
 #include <cstring>
 #include <algorithm>
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 QualifiedNameId::QualifiedNameId(Name *const names[],
                                  unsigned nameCount,
@@ -326,4 +326,4 @@ bool SelectorNameId::isEqualTo(const Name *other) const
     return true;
 }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/Names.h b/src/shared/cplusplus/Names.h
index fa5dd6791f..e5fef0cbec 100644
--- a/src/shared/cplusplus/Names.h
+++ b/src/shared/cplusplus/Names.h
@@ -53,8 +53,8 @@
 #include "Name.h"
 #include "FullySpecifiedType.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT QualifiedNameId: public Name
 {
@@ -304,7 +304,7 @@ private:
     bool _hasArguments;
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_NAMES_H
diff --git a/src/shared/cplusplus/ObjectiveCAtKeywords.cpp b/src/shared/cplusplus/ObjectiveCAtKeywords.cpp
index 3f8fc7c396..cd42d045dd 100644
--- a/src/shared/cplusplus/ObjectiveCAtKeywords.cpp
+++ b/src/shared/cplusplus/ObjectiveCAtKeywords.cpp
@@ -1,7 +1,7 @@
 #include "Lexer.h"
 #include "Token.h"
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 static inline int classify3(const char *s) {
   if (s[0] == 'e') {
@@ -461,4 +461,4 @@ int Lexer::classifyObjCAtKeyword(const char *s, int n) {
   } // switch
 }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp b/src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp
index d12d7c322c..988076f3a7 100644
--- a/src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp
+++ b/src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp
@@ -29,7 +29,7 @@
 
 #include "ObjectiveCTypeQualifiers.h"
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 static inline int classify2(const char *s) {
   if (s[0] == 'i') {
@@ -234,7 +234,7 @@ static inline int classify9(const char *s) {
     return Token_identifier;
 }
 
-int classifyObjectiveCTypeQualifiers(const char *s, int n) {
+int CPlusPlus::classifyObjectiveCTypeQualifiers(const char *s, int n) {
   switch (n) {
     case 2: return classify2(s);
     case 3: return classify3(s);
@@ -247,4 +247,4 @@ int classifyObjectiveCTypeQualifiers(const char *s, int n) {
   } // switch
 }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/ObjectiveCTypeQualifiers.h b/src/shared/cplusplus/ObjectiveCTypeQualifiers.h
index 0f9cdfd677..d0db427461 100644
--- a/src/shared/cplusplus/ObjectiveCTypeQualifiers.h
+++ b/src/shared/cplusplus/ObjectiveCTypeQualifiers.h
@@ -31,8 +31,8 @@
 
 #include "CPlusPlusForwardDeclarations.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 enum {
   Token_in,
@@ -54,7 +54,7 @@ enum {
 
 CPLUSPLUS_EXPORT int classifyObjectiveCTypeQualifiers(const char *s, int n);
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_OBJC_TYPEQUALIFIERS_H
diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp
index e60751305a..a8e04e5ad1 100644
--- a/src/shared/cplusplus/Parser.cpp
+++ b/src/shared/cplusplus/Parser.cpp
@@ -57,7 +57,7 @@
 #include <cstring>
 #include <cassert>
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 Parser::Parser(TranslationUnit *unit)
     : _translationUnit(unit),
@@ -4857,4 +4857,4 @@ bool Parser::parseObjCContextKeyword(int kind, unsigned &in_token)
     }
 }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/Parser.h b/src/shared/cplusplus/Parser.h
index 1dd204d154..753f6f44b2 100644
--- a/src/shared/cplusplus/Parser.h
+++ b/src/shared/cplusplus/Parser.h
@@ -54,8 +54,8 @@
 #include "Token.h"
 #include "TranslationUnit.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT Parser
 {
@@ -305,7 +305,7 @@ private:
     void operator =(const Parser& source);
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_PARSER_H
diff --git a/src/shared/cplusplus/Scope.cpp b/src/shared/cplusplus/Scope.cpp
index fcb5a68027..16026f8060 100644
--- a/src/shared/cplusplus/Scope.cpp
+++ b/src/shared/cplusplus/Scope.cpp
@@ -57,7 +57,7 @@
 
 using namespace std;
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 Scope::Scope(ScopedSymbol *owner)
     : _owner(owner),
@@ -312,4 +312,4 @@ Scope::iterator Scope::firstSymbol() const
 Scope::iterator Scope::lastSymbol() const
 { return _symbols + _symbolCount + 1; }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/Scope.h b/src/shared/cplusplus/Scope.h
index 1abc41530d..c05a718ff3 100644
--- a/src/shared/cplusplus/Scope.h
+++ b/src/shared/cplusplus/Scope.h
@@ -51,8 +51,8 @@
 
 #include "CPlusPlusForwardDeclarations.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT Scope
 {
@@ -153,7 +153,7 @@ private:
     int _hashSize;
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_SCOPE_H
diff --git a/src/shared/cplusplus/Semantic.cpp b/src/shared/cplusplus/Semantic.cpp
index c2ea233d69..e3b4b0b7ca 100644
--- a/src/shared/cplusplus/Semantic.cpp
+++ b/src/shared/cplusplus/Semantic.cpp
@@ -59,7 +59,7 @@
 #include "CheckExpression.h"
 #include "CheckName.h"
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 class Semantic::Data
 {
@@ -252,4 +252,4 @@ int Semantic::visibilityForClassKey(int tokenKind) const
     }
 }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/Semantic.h b/src/shared/cplusplus/Semantic.h
index 8a0df9a111..b07883e847 100644
--- a/src/shared/cplusplus/Semantic.h
+++ b/src/shared/cplusplus/Semantic.h
@@ -52,8 +52,8 @@
 #include "CPlusPlusForwardDeclarations.h"
 #include "ASTfwd.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT Semantic
 {
@@ -114,7 +114,7 @@ private:
     Data *d;
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_SEMANTIC_H
diff --git a/src/shared/cplusplus/SemanticCheck.cpp b/src/shared/cplusplus/SemanticCheck.cpp
index 92fdbf8389..1feffd93aa 100644
--- a/src/shared/cplusplus/SemanticCheck.cpp
+++ b/src/shared/cplusplus/SemanticCheck.cpp
@@ -49,7 +49,7 @@
 #include "SemanticCheck.h"
 #include "Semantic.h"
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 SemanticCheck::SemanticCheck(Semantic *semantic)
     : ASTVisitor(semantic->control()),
@@ -65,4 +65,4 @@ Semantic *SemanticCheck::semantic() const
 Control *SemanticCheck::control() const
 { return _semantic->control(); }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/SemanticCheck.h b/src/shared/cplusplus/SemanticCheck.h
index 219a216e6e..64523d903c 100644
--- a/src/shared/cplusplus/SemanticCheck.h
+++ b/src/shared/cplusplus/SemanticCheck.h
@@ -52,8 +52,8 @@
 #include "CPlusPlusForwardDeclarations.h"
 #include "ASTVisitor.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT SemanticCheck: public ASTVisitor
 {
@@ -68,7 +68,7 @@ private:
     Semantic *_semantic;
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_SEMANTICCHECK_H
diff --git a/src/shared/cplusplus/Symbol.cpp b/src/shared/cplusplus/Symbol.cpp
index dc80add92b..c04df48baf 100644
--- a/src/shared/cplusplus/Symbol.cpp
+++ b/src/shared/cplusplus/Symbol.cpp
@@ -59,7 +59,7 @@
 #include <cstddef>
 #include <cassert>
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 class Symbol::HashCode: protected NameVisitor
 {
@@ -476,4 +476,4 @@ bool Symbol::isObjCForwardProtocolDeclaration() const
 bool Symbol::isObjCMethod() const
 { return asObjCMethod() != 0; }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/Symbol.h b/src/shared/cplusplus/Symbol.h
index 0857673d3f..93d730b0cf 100644
--- a/src/shared/cplusplus/Symbol.h
+++ b/src/shared/cplusplus/Symbol.h
@@ -51,8 +51,8 @@
 
 #include "CPlusPlusForwardDeclarations.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT Symbol
 {
@@ -331,7 +331,7 @@ private:
     friend class Scope;
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_SYMBOL_H
diff --git a/src/shared/cplusplus/SymbolVisitor.cpp b/src/shared/cplusplus/SymbolVisitor.cpp
index 09556c0773..de2a5f7eaf 100644
--- a/src/shared/cplusplus/SymbolVisitor.cpp
+++ b/src/shared/cplusplus/SymbolVisitor.cpp
@@ -49,7 +49,7 @@
 #include "SymbolVisitor.h"
 #include "Symbol.h"
 
-CPLUSPLUS_USE_NAMESPACE
+using namespace CPlusPlus;
 
 SymbolVisitor::SymbolVisitor()
 { }
diff --git a/src/shared/cplusplus/SymbolVisitor.h b/src/shared/cplusplus/SymbolVisitor.h
index 8708ab0321..4bfa379430 100644
--- a/src/shared/cplusplus/SymbolVisitor.h
+++ b/src/shared/cplusplus/SymbolVisitor.h
@@ -51,8 +51,8 @@
 
 #include "CPlusPlusForwardDeclarations.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT SymbolVisitor
 {
@@ -90,7 +90,7 @@ public:
     virtual bool visit(ObjCMethod *) { return true; }
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // SYMBOLVISITOR_H
diff --git a/src/shared/cplusplus/Symbols.cpp b/src/shared/cplusplus/Symbols.cpp
index d5fa07a99b..aa15735410 100644
--- a/src/shared/cplusplus/Symbols.cpp
+++ b/src/shared/cplusplus/Symbols.cpp
@@ -53,7 +53,7 @@
 #include "Scope.h"
 #include <cstdlib>
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 TemplateParameters::TemplateParameters(Scope *scope)
     : _previous(0), _scope(scope)
@@ -819,4 +819,4 @@ void ObjCMethod::visitSymbol0(SymbolVisitor *visitor)
     }
 }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/Symbols.h b/src/shared/cplusplus/Symbols.h
index 10eb0366bf..acd13085f5 100644
--- a/src/shared/cplusplus/Symbols.h
+++ b/src/shared/cplusplus/Symbols.h
@@ -55,8 +55,8 @@
 #include "FullySpecifiedType.h"
 #include "Array.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class TemplateParameters
 {
@@ -729,7 +729,7 @@ private:
     Scope *_arguments;
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_SYMBOLS_H
diff --git a/src/shared/cplusplus/Token.cpp b/src/shared/cplusplus/Token.cpp
index 547849b1cc..48bf61354f 100644
--- a/src/shared/cplusplus/Token.cpp
+++ b/src/shared/cplusplus/Token.cpp
@@ -49,7 +49,7 @@
 #include "Token.h"
 #include "Literals.h"
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 static const char *token_names[] = {
     (""), ("<error>"),
@@ -133,4 +133,4 @@ const char *Token::spell() const
     } // switch
 }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/Token.h b/src/shared/cplusplus/Token.h
index 00d42b7f89..8bafc44687 100644
--- a/src/shared/cplusplus/Token.h
+++ b/src/shared/cplusplus/Token.h
@@ -52,8 +52,8 @@
 #include "CPlusPlusForwardDeclarations.h"
 #include <cstddef>
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 enum Kind {
     T_EOF_SYMBOL = 0,
@@ -336,7 +336,7 @@ public:
     };
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_TOKEN_H
diff --git a/src/shared/cplusplus/TranslationUnit.cpp b/src/shared/cplusplus/TranslationUnit.cpp
index b661bf26a0..0cecccf319 100644
--- a/src/shared/cplusplus/TranslationUnit.cpp
+++ b/src/shared/cplusplus/TranslationUnit.cpp
@@ -61,7 +61,7 @@
 
 using namespace std;
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 TranslationUnit::TranslationUnit(Control *control, StringLiteral *fileId)
     : _control(control),
@@ -517,4 +517,4 @@ void TranslationUnit::release()
     _tokens = 0;
 }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/TranslationUnit.h b/src/shared/cplusplus/TranslationUnit.h
index 608d510f70..cc26f44be4 100644
--- a/src/shared/cplusplus/TranslationUnit.h
+++ b/src/shared/cplusplus/TranslationUnit.h
@@ -56,8 +56,8 @@
 #include <stdio.h> // for FILE*
 #include <vector> // ### remove me
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT TranslationUnit
 {
@@ -204,7 +204,7 @@ private:
     };
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_TRANSLATIONUNIT_H
diff --git a/src/shared/cplusplus/Type.cpp b/src/shared/cplusplus/Type.cpp
index 99cef5fab4..56a521cd85 100644
--- a/src/shared/cplusplus/Type.cpp
+++ b/src/shared/cplusplus/Type.cpp
@@ -51,7 +51,7 @@
 #include "CoreTypes.h"
 #include "Symbols.h"
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 Type::Type()
 { }
@@ -131,4 +131,4 @@ void Type::accept(Type *type, TypeVisitor *visitor)
     type->accept(visitor);
 }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/Type.h b/src/shared/cplusplus/Type.h
index a3c5fb0c00..82dfa1f63a 100644
--- a/src/shared/cplusplus/Type.h
+++ b/src/shared/cplusplus/Type.h
@@ -51,8 +51,8 @@
 
 #include "CPlusPlusForwardDeclarations.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT Type
 {
@@ -130,7 +130,7 @@ protected:
     virtual void accept0(TypeVisitor *visitor) = 0;
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_TYPE_H
diff --git a/src/shared/cplusplus/TypeVisitor.cpp b/src/shared/cplusplus/TypeVisitor.cpp
index 1f1b7eff16..4c795c96e0 100644
--- a/src/shared/cplusplus/TypeVisitor.cpp
+++ b/src/shared/cplusplus/TypeVisitor.cpp
@@ -49,7 +49,7 @@
 #include "TypeVisitor.h"
 #include "Type.h"
 
-CPLUSPLUS_BEGIN_NAMESPACE
+using namespace CPlusPlus;
 
 TypeVisitor::TypeVisitor()
 { }
@@ -60,4 +60,4 @@ TypeVisitor::~TypeVisitor()
 void TypeVisitor::accept(Type *type)
 { Type::accept(type, this); }
 
-CPLUSPLUS_END_NAMESPACE
+
diff --git a/src/shared/cplusplus/TypeVisitor.h b/src/shared/cplusplus/TypeVisitor.h
index 50337ae93f..5d0ef4cd54 100644
--- a/src/shared/cplusplus/TypeVisitor.h
+++ b/src/shared/cplusplus/TypeVisitor.h
@@ -51,8 +51,8 @@
 
 #include "CPlusPlusForwardDeclarations.h"
 
-CPLUSPLUS_BEGIN_HEADER
-CPLUSPLUS_BEGIN_NAMESPACE
+
+namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT TypeVisitor
 {
@@ -88,7 +88,7 @@ public:
     virtual void visit(ObjCForwardProtocolDeclaration*) {}
 };
 
-CPLUSPLUS_END_NAMESPACE
-CPLUSPLUS_END_HEADER
+} // end of namespace CPlusPlus
+
 
 #endif // CPLUSPLUS_TYPEVISITOR_H
diff --git a/tests/auto/cplusplus/ast/tst_ast.cpp b/tests/auto/cplusplus/ast/tst_ast.cpp
index 25871aea12..52dcc0a0f1 100644
--- a/tests/auto/cplusplus/ast/tst_ast.cpp
+++ b/tests/auto/cplusplus/ast/tst_ast.cpp
@@ -7,7 +7,7 @@
 #include <Parser.h>
 #include <AST.h>
 
-CPLUSPLUS_USE_NAMESPACE
+using namespace CPlusPlus;
 
 class tst_AST: public QObject
 {
diff --git a/tests/auto/cplusplus/lookup/tst_lookup.cpp b/tests/auto/cplusplus/lookup/tst_lookup.cpp
index f3e6a570d5..8b64c58395 100644
--- a/tests/auto/cplusplus/lookup/tst_lookup.cpp
+++ b/tests/auto/cplusplus/lookup/tst_lookup.cpp
@@ -10,7 +10,7 @@
 #include <Symbols.h>
 #include <Overview.h>
 
-CPLUSPLUS_USE_NAMESPACE
+using namespace CPlusPlus;
 
 template <template <typename, typename> class _Map, typename _T1, typename _T2>
 _Map<_T2, _T1> invert(const _Map<_T1, _T2> &m)
diff --git a/tests/auto/cplusplus/semantic/tst_semantic.cpp b/tests/auto/cplusplus/semantic/tst_semantic.cpp
index 996d45ed06..3df6573ccd 100644
--- a/tests/auto/cplusplus/semantic/tst_semantic.cpp
+++ b/tests/auto/cplusplus/semantic/tst_semantic.cpp
@@ -13,7 +13,7 @@
 #include <Literals.h>
 #include <DiagnosticClient.h>
 
-CPLUSPLUS_USE_NAMESPACE
+using namespace CPlusPlus;
 
 class tst_Semantic: public QObject
 {