feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++: Compile fixes in tests and tools.

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

Change-Id: I7ed24bb1c8e55e55ed74eda3a8fd7610e725f4cb
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Nikolai Kosjar
2012-10-23 10:50:38 +02:00
committed by hjk
parent 1da50de19c
commit 5d730be06e
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/cplusplus/LookupContext.cpp
View File

@@ -779,7 +779,7 @@ ClassOrNamespace *ClassOrNamespace::nestedType(const Name *name, ClassOrNamespac
Symbol *clone = cloner.symbol(s, &subst); Symbol *clone = cloner.symbol(s, &subst);
instantiation->_symbols.append(clone); instantiation->_symbols.append(clone);
#ifdef DEBUG_LOOKUP #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()); qDebug()<<"cloned"<<oo(clone->type());
#endif // DEBUG_LOOKUP #endif // DEBUG_LOOKUP
} }

4
src/libs/cplusplus/ResolveExpression.cpp
View File

@@ -774,8 +774,8 @@ QList<LookupItem> ResolveExpression::getMembers(ClassOrNamespace *binding, const
FullySpecifiedType instantiatedTy = rewriteType(decl->type(), &env, _context.control().data()); FullySpecifiedType instantiatedTy = rewriteType(decl->type(), &env, _context.control().data());
Overview oo; Overview oo;
oo.setShowReturnTypes(true); oo.showReturnTypes = true;
oo.setShowFunctionSignatures(true); oo.showFunctionSignatures = true;
qDebug() << "original:" << oo(decl->type(), decl->name()) << "inst:" << oo(instantiatedTy, decl->name()); qDebug() << "original:" << oo(decl->type(), decl->name()) << "inst:" << oo(instantiatedTy, decl->name());

2
tests/auto/cplusplus/semantic/tst_semantic.cpp
View File

@@ -486,7 +486,7 @@ void tst_Semantic::template_instance_1()
FullySpecifiedType genTy = DeprecatedGenTemplateInstance::instantiate(templId, decl, control); FullySpecifiedType genTy = DeprecatedGenTemplateInstance::instantiate(templId, decl, control);
Overview oo; Overview oo;
oo.setShowReturnTypes(true); oo.showReturnTypes = true;
const QString genDecl = oo.prettyType(genTy); const QString genDecl = oo.prettyType(genTy);
QCOMPARE(genDecl, QString::fromLatin1("void (const int &)")); QCOMPARE(genDecl, QString::fromLatin1("void (const int &)"));

2
tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp
View File

@@ -208,7 +208,7 @@ void tst_TypePrettyPrinter::basic()
QFETCH(QString, result); QFETCH(QString, result);
Overview o; Overview o;
o.setShowReturnTypes(true); o.showReturnTypes = true;
TypePrettyPrinter pp(&o); TypePrettyPrinter pp(&o);
QCOMPARE(pp(type, name), result); QCOMPARE(pp(type, name), result);
} }

6
tests/tools/cplusplus-dump/main.cpp
View File

@@ -188,9 +188,9 @@ public:
SymbolDump(TranslationUnit *unit) SymbolDump(TranslationUnit *unit)
: translationUnit(unit) : translationUnit(unit)
{ {
o.setShowArgumentNames(true); o.showArgumentNames = true;
o.setShowFunctionSignatures(true); o.showFunctionSignatures = true;
o.setShowReturnTypes(true); o.showReturnTypes = true;
} }
void operator()(Symbol *s) { void operator()(Symbol *s) {