diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-04-21 15:29:27 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-04-21 15:30:00 +0200 |
| commit | dae2556d2ffb3ea4982e9caf312ac95811ddbe72 (patch) | |
| tree | cc90426882671565d337ef68cdb6a67f7be9b893 /src/libs/cplusplus | |
| parent | ac86b2e8ddbd1f9874475a8ee0d5418f12eadea4 (diff) | |
| parent | 1891af4b07801e6cbab95aca77b2ef4979b46cc0 (diff) | |
| download | qt-creator-dae2556d2ffb3ea4982e9caf312ac95811ddbe72.tar.gz | |
Merge remote-tracking branch 'origin/4.3'
Change-Id: I44511e06986b7df6007be7daf7051c895a10794b
Diffstat (limited to 'src/libs/cplusplus')
| -rw-r--r-- | src/libs/cplusplus/BackwardsScanner.cpp | 13 | ||||
| -rw-r--r-- | src/libs/cplusplus/LookupContext.cpp | 2 | ||||
| -rw-r--r-- | src/libs/cplusplus/ResolveExpression.cpp | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/libs/cplusplus/BackwardsScanner.cpp b/src/libs/cplusplus/BackwardsScanner.cpp index 20f70142f0..6d498eaddc 100644 --- a/src/libs/cplusplus/BackwardsScanner.cpp +++ b/src/libs/cplusplus/BackwardsScanner.cpp @@ -27,6 +27,8 @@ #include <cplusplus/Token.h> +#include <utils/algorithm.h> + #include <QTextCursor> #include <QTextDocument> @@ -75,12 +77,11 @@ const Token &BackwardsScanner::fetchToken(int tokenIndex) _text.prepend(QLatin1Char('\n')); _text.prepend(blockText); - Tokens adaptedTokens; - for (int i = 0; i < _tokens.size(); ++i) { - Token t = _tokens.at(i); - t.utf16charOffset += blockText.length() + 1; - adaptedTokens.append(t); - } + const int offset = blockText.length() + 1; + const Tokens adaptedTokens = Utils::transform(_tokens, [offset](Token token) { + token.utf16charOffset += unsigned(offset); + return token; + }); _tokens = _tokenize(blockText, previousBlockState(_block)); _offset += _tokens.size(); diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp index 881c985f86..cb2aead5a3 100644 --- a/src/libs/cplusplus/LookupContext.cpp +++ b/src/libs/cplusplus/LookupContext.cpp @@ -44,7 +44,7 @@ using namespace CPlusPlus; -static const bool debug = ! qgetenv("QTC_LOOKUPCONTEXT_DEBUG").isEmpty(); +static const bool debug = qEnvironmentVariableIsSet("QTC_LOOKUPCONTEXT_DEBUG"); static void addNames(const Name *name, QList<const Name *> *names, bool addAllNames = false) { diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp index 69ce4f4cb4..6fa256523e 100644 --- a/src/libs/cplusplus/ResolveExpression.cpp +++ b/src/libs/cplusplus/ResolveExpression.cpp @@ -50,7 +50,7 @@ using namespace CPlusPlus; -static const bool debug = ! qgetenv("QTC_LOOKUPCONTEXT_DEBUG").isEmpty(); +static const bool debug = qEnvironmentVariableIsSet("QTC_LOOKUPCONTEXT_DEBUG"); namespace { |