feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.3'

Browse Source 
Change-Id: I44511e06986b7df6007be7daf7051c895a10794b
This commit is contained in:
Eike Ziller
2017-04-21 15:29:27 +02:00
parent ac86b2e8dd 1891af4b07
commit dae2556d2f
49 changed files with 191 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libs/cplusplus/BackwardsScanner.cpp
View File

@@ -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();

2
src/libs/cplusplus/LookupContext.cpp
View File

@@ -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)
{

2
src/libs/cplusplus/ResolveExpression.cpp
View File

@@ -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 {