diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp b/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp index 09a00ceb43..951c6efd53 100644 --- a/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp +++ b/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp @@ -69,11 +69,6 @@ static QString addType(const QString &signature, const ClangBackEnd::ExtraInfo & return signature + QLatin1String(" -> ", 4) + extraInfo.typeSpelling.toString(); } -static QString addTypeToVariableName(const QString &name, const ClangBackEnd::ExtraInfo &extraInfo) -{ - return extraInfo.typeSpelling.toString() + QLatin1String(" ") + name; -} - static Core::LocatorFilterEntry makeEntry(Core::ILocatorFilter *filter, const ClangBackEnd::TokenInfoContainer &info) { @@ -84,14 +79,12 @@ static Core::LocatorFilterEntry makeEntry(Core::ILocatorFilter *filter, QString extra; ClangBackEnd::HighlightingType mainType = info.types.mainHighlightingType; if (mainType == ClangBackEnd::HighlightingType::VirtualFunction - || mainType == ClangBackEnd::HighlightingType::Function) { + || mainType == ClangBackEnd::HighlightingType::Function + || mainType == ClangBackEnd::HighlightingType::GlobalVariable + || mainType == ClangBackEnd::HighlightingType::Field + || mainType == ClangBackEnd::HighlightingType::QtProperty) { displayName = addType(displayName, extraInfo); extra = extraInfo.semanticParentTypeSpelling.toString(); - } else if (mainType == ClangBackEnd::HighlightingType::GlobalVariable - || mainType == ClangBackEnd::HighlightingType::Field - || mainType == ClangBackEnd::HighlightingType::QtProperty) { - displayName = addTypeToVariableName(displayName, extraInfo); - extra = extraInfo.semanticParentTypeSpelling.toString(); } else { extra = extraInfo.typeSpelling.toString(); } |