From 5d730be06e4e4138ecda9df09efe3736294baf73 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@digia.com>
Date: Tue, 23 Oct 2012 10:50:38 +0200
Subject: [PATCH] C++: Compile fixes in tests and tools.

After some refactorings not all usages, especially in tests and tools,
were adapted.

Change-Id: I7ed24bb1c8e55e55ed74eda3a8fd7610e725f4cb
Reviewed-by: hjk <qthjk@ovi.com>
---
 src/libs/cplusplus/LookupContext.cpp                        | 2 +-
 src/libs/cplusplus/ResolveExpression.cpp                    | 4 ++--
 tests/auto/cplusplus/semantic/tst_semantic.cpp              | 2 +-
 .../cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp   | 2 +-
 tests/tools/cplusplus-dump/main.cpp                         | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp
index 65b87de7653..50d9655b231 100644
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/src/libs/cplusplus/LookupContext.cpp
@@ -779,7 +779,7 @@ ClassOrNamespace *ClassOrNamespace::nestedType(const Name *name, ClassOrNamespac
                     Symbol *clone = cloner.symbol(s, &subst);
                     instantiation->_symbols.append(clone);
 #ifdef DEBUG_LOOKUP
-                    Overview oo;oo.setShowFunctionSignatures(true);oo.setShowReturnTypes(true);oo.setShowTemplateParameters(true);
+                    Overview oo;oo.showFunctionSignatures = true;oo.showReturnTypes = true; oo.showTemplateParameters = true;
                     qDebug()<<"cloned"<<oo(clone->type());
 #endif // DEBUG_LOOKUP
                 }
diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index dfa634d799b..02f8e56a907 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -774,8 +774,8 @@ QList<LookupItem> ResolveExpression::getMembers(ClassOrNamespace *binding, const
                 FullySpecifiedType instantiatedTy = rewriteType(decl->type(), &env, _context.control().data());
 
                 Overview oo;
-                oo.setShowReturnTypes(true);
-                oo.setShowFunctionSignatures(true);
+                oo.showReturnTypes = true;
+                oo.showFunctionSignatures = true;
 
                 qDebug() << "original:" << oo(decl->type(), decl->name()) << "inst:" << oo(instantiatedTy, decl->name());
 
diff --git a/tests/auto/cplusplus/semantic/tst_semantic.cpp b/tests/auto/cplusplus/semantic/tst_semantic.cpp
index df23ae319f1..d5858fc4952 100644
--- a/tests/auto/cplusplus/semantic/tst_semantic.cpp
+++ b/tests/auto/cplusplus/semantic/tst_semantic.cpp
@@ -486,7 +486,7 @@ void tst_Semantic::template_instance_1()
     FullySpecifiedType genTy = DeprecatedGenTemplateInstance::instantiate(templId, decl, control);
 
     Overview oo;
-    oo.setShowReturnTypes(true);
+    oo.showReturnTypes = true;
 
     const QString genDecl = oo.prettyType(genTy);
     QCOMPARE(genDecl, QString::fromLatin1("void (const int &)"));
diff --git a/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp b/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp
index 3b678c2210f..01af1421873 100644
--- a/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp
+++ b/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp
@@ -208,7 +208,7 @@ void tst_TypePrettyPrinter::basic()
     QFETCH(QString, result);
 
     Overview o;
-    o.setShowReturnTypes(true);
+    o.showReturnTypes = true;
     TypePrettyPrinter pp(&o);
     QCOMPARE(pp(type, name), result);
 }
diff --git a/tests/tools/cplusplus-dump/main.cpp b/tests/tools/cplusplus-dump/main.cpp
index 168f7c2b117..5b33ad4e4a4 100644
--- a/tests/tools/cplusplus-dump/main.cpp
+++ b/tests/tools/cplusplus-dump/main.cpp
@@ -188,9 +188,9 @@ public:
     SymbolDump(TranslationUnit *unit)
         : translationUnit(unit)
     {
-        o.setShowArgumentNames(true);
-        o.setShowFunctionSignatures(true);
-        o.setShowReturnTypes(true);
+        o.showArgumentNames = true;
+        o.showFunctionSignatures = true;
+        o.showReturnTypes = true;
     }
 
     void operator()(Symbol *s) {