diff options
Diffstat (limited to 'src/libs/cplusplus')
-rw-r--r-- | src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp | 8 | ||||
-rw-r--r-- | src/libs/cplusplus/Dumpers.cpp | 4 | ||||
-rw-r--r-- | src/libs/cplusplus/LookupContext.cpp | 12 | ||||
-rw-r--r-- | src/libs/cplusplus/TypePrettyPrinter.cpp | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp b/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp index 4c8c752fab..eb27a6bf55 100644 --- a/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp +++ b/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp @@ -304,25 +304,25 @@ private: virtual void visit(const DestructorNameId *name) { Overview oo; - qWarning() << "ignored name:" << oo(name); + qWarning() << "ignored name:" << oo.prettyName(name); } virtual void visit(const OperatorNameId *name) { Overview oo; - qWarning() << "ignored name:" << oo(name); + qWarning() << "ignored name:" << oo.prettyName(name); } virtual void visit(const ConversionNameId *name) { Overview oo; - qWarning() << "ignored name:" << oo(name); + qWarning() << "ignored name:" << oo.prettyName(name); } virtual void visit(const SelectorNameId *name) { Overview oo; - qWarning() << "ignored name:" << oo(name); + qWarning() << "ignored name:" << oo.prettyName(name); } private: diff --git a/src/libs/cplusplus/Dumpers.cpp b/src/libs/cplusplus/Dumpers.cpp index be6dcaa265..2a20ea72f4 100644 --- a/src/libs/cplusplus/Dumpers.cpp +++ b/src/libs/cplusplus/Dumpers.cpp @@ -55,13 +55,13 @@ static QString indent(QString s, int level = 2) QString CPlusPlus::toString(const Name *name, QString id) { Overview oo; - return QString("%0: %1").arg(id, name ? oo(name) : QLatin1String("(null)")); + return QString("%0: %1").arg(id, name ? oo.prettyName(name) : QLatin1String("(null)")); } QString CPlusPlus::toString(FullySpecifiedType ty, QString id) { Overview oo; - return QString("%0: %1 (a %2)").arg(id, oo(ty), ty.type() ? typeid(*ty.type()).name() : "(null)"); + return QString("%0: %1 (a %2)").arg(id, oo.prettyType(ty), ty.type() ? typeid(*ty.type()).name() : "(null)"); } QString CPlusPlus::toString(const Symbol *s, QString id) diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp index 1fbe5c5e60..a9ea1f33da 100644 --- a/src/libs/cplusplus/LookupContext.cpp +++ b/src/libs/cplusplus/LookupContext.cpp @@ -1106,7 +1106,7 @@ bool CreateBindings::visit(Declaration *decl) _currentClassOrNamespace->addNestedType(decl->name(), e); } else if (false) { Overview oo; - qDebug() << "found entity not found for" << oo(namedTy->name()); + qDebug() << "found entity not found for" << oo.prettyName(namedTy->name()); } } else if (Class *klass = ty->asClassType()) { if (const Identifier *nameId = decl->name()->asNameId()) { @@ -1131,7 +1131,7 @@ bool CreateBindings::visit(BaseClass *b) _currentClassOrNamespace->addUsing(base); } else if (false) { Overview oo; - qDebug() << "no entity for:" << oo(b->name()); + qDebug() << "no entity for:" << oo.prettyName(b->name()); } return false; } @@ -1157,7 +1157,7 @@ bool CreateBindings::visit(UsingNamespaceDirective *u) _currentClassOrNamespace->addUsing(e); } else if (false) { Overview oo; - qDebug() << "no entity for namespace:" << oo(u->name()); + qDebug() << "no entity for namespace:" << oo.prettyName(u->name()); } return false; } @@ -1173,7 +1173,7 @@ bool CreateBindings::visit(NamespaceAlias *a) } else if (false) { Overview oo; - qDebug() << "no entity for namespace:" << oo(a->namespaceName()); + qDebug() << "no entity for namespace:" << oo.prettyName(a->namespaceName()); } return false; @@ -1201,7 +1201,7 @@ bool CreateBindings::visit(ObjCBaseClass *b) _currentClassOrNamespace->addUsing(base); } else if (false) { Overview oo; - qDebug() << "no entity for:" << oo(b->name()); + qDebug() << "no entity for:" << oo.prettyName(b->name()); } return false; } @@ -1233,7 +1233,7 @@ bool CreateBindings::visit(ObjCBaseProtocol *b) _currentClassOrNamespace->addUsing(base); } else if (false) { Overview oo; - qDebug() << "no entity for:" << oo(b->name()); + qDebug() << "no entity for:" << oo.prettyName(b->name()); } return false; } diff --git a/src/libs/cplusplus/TypePrettyPrinter.cpp b/src/libs/cplusplus/TypePrettyPrinter.cpp index dc3e0108f9..035a6f6be6 100644 --- a/src/libs/cplusplus/TypePrettyPrinter.cpp +++ b/src/libs/cplusplus/TypePrettyPrinter.cpp @@ -345,7 +345,7 @@ void TypePrettyPrinter::visit(Function *type) if (_overview->showArgumentNames) name = arg->name(); - _text += argumentText(arg->type(), name); + _text += argumentText.prettyType(arg->type(), name); if (_overview->showDefaultArguments) { if (const StringLiteral *initializer = arg->initializer()) { |