diff options
| -rw-r--r-- | src/libs/cplusplus/Overview.cpp | 13 | ||||
| -rw-r--r-- | src/libs/cplusplus/Overview.h | 4 | ||||
| -rw-r--r-- | src/libs/cplusplus/TypePrettyPrinter.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/cpptools/cppcodecompletion.cpp | 1 |
4 files changed, 22 insertions, 4 deletions
diff --git a/src/libs/cplusplus/Overview.cpp b/src/libs/cplusplus/Overview.cpp index ea1cec43fd0..37ec7d7e1db 100644 --- a/src/libs/cplusplus/Overview.cpp +++ b/src/libs/cplusplus/Overview.cpp @@ -41,7 +41,8 @@ Overview::Overview() _showArgumentNames(false), _showReturnTypes(false), _showFunctionSignatures(true), - _showFullyQualifiedNames(false) + _showFullyQualifiedNames(false), + _showDefaultArguments(true) { } Overview::~Overview() @@ -117,6 +118,16 @@ void Overview::setShowFullyQualifiedNamed(bool showFullyQualifiedNames) _showFullyQualifiedNames = showFullyQualifiedNames; } +bool Overview::showDefaultArguments() const +{ + return _showDefaultArguments; +} + +void Overview::setShowDefaultArguments(bool showDefaultArguments) +{ + _showDefaultArguments = showDefaultArguments; +} + QString Overview::prettyName(const Name *name) const { NamePrettyPrinter pp(this); diff --git a/src/libs/cplusplus/Overview.h b/src/libs/cplusplus/Overview.h index ec4cf1879d0..b1018def6bd 100644 --- a/src/libs/cplusplus/Overview.h +++ b/src/libs/cplusplus/Overview.h @@ -56,6 +56,9 @@ public: bool showFullyQualifiedNames() const; void setShowFullyQualifiedNamed(bool showFullyQualifiedNames); + bool showDefaultArguments() const; + void setShowDefaultArguments(bool showDefaultArguments); + // argument index that you want to mark unsigned markedArgument() const; void setMarkedArgument(unsigned position); @@ -84,6 +87,7 @@ private: bool _showReturnTypes: 1; bool _showFunctionSignatures: 1; bool _showFullyQualifiedNames: 1; + bool _showDefaultArguments: 1; }; } // end of namespace CPlusPlus diff --git a/src/libs/cplusplus/TypePrettyPrinter.cpp b/src/libs/cplusplus/TypePrettyPrinter.cpp index 214d25f182b..d0f958d1dba 100644 --- a/src/libs/cplusplus/TypePrettyPrinter.cpp +++ b/src/libs/cplusplus/TypePrettyPrinter.cpp @@ -340,9 +340,11 @@ void TypePrettyPrinter::visit(Function *type) _text += argumentText(arg->type(), name); - if (const StringLiteral *initializer = arg->initializer()) { - _text += QLatin1String(" ="); - _text += QString::fromUtf8(initializer->chars(), initializer->size()); + if (_overview->showDefaultArguments()) { + if (const StringLiteral *initializer = arg->initializer()) { + _text += QLatin1String(" ="); + _text += QString::fromUtf8(initializer->chars(), initializer->size()); + } } if (index + 1 == _overview->markedArgument()) diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp index 4d6ee8eb63b..ac0d9813e71 100644 --- a/src/plugins/cpptools/cppcodecompletion.cpp +++ b/src/plugins/cpptools/cppcodecompletion.cpp @@ -1096,6 +1096,7 @@ bool CppCodeCompletion::completeConstructorOrFunction(const QList<LookupItem> &r foreach (Function *f, functions) { Overview overview; overview.setShowArgumentNames(true); + overview.setShowDefaultArguments(false); // gets: "parameter list) cv-spec", QString completion = overview(f->type()).mid(1); |