diff options
| author | hjk <hjk@qt.io> | 2018-04-04 18:25:23 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2018-04-06 12:55:23 +0000 |
| commit | cf4dbb4bb628c4d51ae866b278a5d0733674c129 (patch) | |
| tree | 84ecd3c4f841192460142b507bd1e4923b53017c /src/plugins/clangcodemodel/clangutils.cpp | |
| parent | 4a0bbed560a53b644d8d3c9a9db218054582bd89 (diff) | |
ClangSupport: Use simpler structures in some cases
The patch is mostly mechanical, but contains also a few spurious changes
from values references for some local variables, foreach -> ranged for
etc that I coulnd't resist.
Change-Id: I58f0bd972546895eb318607cbfbd7ac35caf3f23
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Diffstat (limited to 'src/plugins/clangcodemodel/clangutils.cpp')
| -rw-r--r-- | src/plugins/clangcodemodel/clangutils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp index ac80638b61..7169eb38a0 100644 --- a/src/plugins/clangcodemodel/clangutils.cpp +++ b/src/plugins/clangcodemodel/clangutils.cpp @@ -207,7 +207,7 @@ int clangColumn(const QTextBlock &line, int cppEditorColumn) CPlusPlus::Icons::IconType iconTypeForToken(const ClangBackEnd::TokenInfoContainer &token) { - const ClangBackEnd::ExtraInfo &extraInfo = token.extraInfo(); + const ClangBackEnd::ExtraInfo &extraInfo = token.extraInfo; if (extraInfo.signal) return CPlusPlus::Icons::SignalIconType; @@ -224,7 +224,7 @@ CPlusPlus::Icons::IconType iconTypeForToken(const ClangBackEnd::TokenInfoContain } } - ClangBackEnd::HighlightingType mainType = token.types().mainHighlightingType; + ClangBackEnd::HighlightingType mainType = token.types.mainHighlightingType; if (mainType == ClangBackEnd::HighlightingType::Keyword) return CPlusPlus::Icons::KeywordIconType; @@ -241,7 +241,7 @@ CPlusPlus::Icons::IconType iconTypeForToken(const ClangBackEnd::TokenInfoContain return CPlusPlus::Icons::EnumeratorIconType; if (mainType == ClangBackEnd::HighlightingType::Type) { - const ClangBackEnd::MixinHighlightingTypes &types = token.types().mixinHighlightingTypes; + const ClangBackEnd::MixinHighlightingTypes &types = token.types.mixinHighlightingTypes; if (types.contains(ClangBackEnd::HighlightingType::Enum)) return CPlusPlus::Icons::EnumIconType; if (types.contains(ClangBackEnd::HighlightingType::Struct)) |