Merge remote branch 'origin/1.3'

Conflicts:
	src/plugins/cpptools/cppcodecompletion.cpp
	src/plugins/debugger/gdb/remotegdbadapter.cpp

1 files changed, 2 insertions, 6 deletions

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
+