diff options
| author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-04-19 14:59:22 +0200 |
|---|---|---|
| committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-04-23 07:59:40 +0000 |
| commit | ef660d8bd03b71dfa51ac08ef72c3ebc1adbbfd7 (patch) | |
| tree | 7c4ec6d2dd42c4a8dc828c0777d1eacb2e7548b3 /src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp | |
| parent | fccff5982f30fdcf991617eaa2b3953fe669a025 (diff) | |
Clang: Simplify name and type in FullTokenInfo for functions
Take Cursor displayName instead of token name.
From now on type spelling can serve the return type
role for functions because together with 'token' member
they form the full type.
Change-Id: Ic8eec533f4a11458f99f070b6a6aa80714097b4d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp')
| -rw-r--r-- | src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp b/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp index 76c4474b03..3b05722d6f 100644 --- a/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp +++ b/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp @@ -66,11 +66,9 @@ ClangCurrentDocumentFilter::ClangCurrentDocumentFilter() Qt::QueuedConnection); } -static QString addResultTypeToFunctionSignature(const QString &signature, - const ClangBackEnd::ExtraInfo &extraInfo) +static QString addType(const QString &signature, const ClangBackEnd::ExtraInfo &extraInfo) { - return signature + extraInfo.typeSpelling.toString() + QLatin1String(" -> ", 4) - + extraInfo.resultTypeSpelling.toString(); + return signature + QLatin1String(" -> ", 4) + extraInfo.typeSpelling.toString(); } static QString addTypeToVariableName(const QString &name, const ClangBackEnd::ExtraInfo &extraInfo) @@ -89,7 +87,7 @@ static Core::LocatorFilterEntry makeEntry(Core::ILocatorFilter *filter, ClangBackEnd::HighlightingType mainType = info.types.mainHighlightingType; if (mainType == ClangBackEnd::HighlightingType::VirtualFunction || mainType == ClangBackEnd::HighlightingType::Function) { - displayName = addResultTypeToFunctionSignature(displayName, extraInfo); + displayName = addType(displayName, extraInfo); extra = extraInfo.semanticParentTypeSpelling.toString(); } else if (mainType == ClangBackEnd::HighlightingType::GlobalVariable || mainType == ClangBackEnd::HighlightingType::Field |