diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-12-13 18:41:15 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-05-15 15:55:38 +0200 |
| commit | 126e69137a7b3cfdf86832c2561f1dde311e9ad6 (patch) | |
| tree | a884d65be6c50dfbd876091c295bfd0245f8f30d /src/plugins/cpptools/cppcompletionassist.cpp | |
| parent | ba76baa65fa9ad4d1f3154639be385c7b49dc1dd (diff) | |
| download | qt-creator-126e69137a7b3cfdf86832c2561f1dde311e9ad6.tar.gz | |
C++: Clarify units of a Token
This will avoid confusion when later more length and indices methods are
added.
In Token:
length() --> bytes()
begin() --> bytesBegin()
end() --> bytesEnd()
Change-Id: I244c69b022e239ee762b4114559e707f93ff344f
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppcompletionassist.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppcompletionassist.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp index 0b1eff5066..16f4cfbcf6 100644 --- a/src/plugins/cpptools/cppcompletionassist.cpp +++ b/src/plugins/cpptools/cppcompletionassist.cpp @@ -703,7 +703,8 @@ bool CppCompletionAssistProcessor::accepts() const const QString &line = tc.block().text(); const Token &idToken = tokens.at(1); const QStringRef &identifier = - line.midRef(idToken.begin(), idToken.end() - idToken.begin()); + line.midRef(idToken.bytesBegin(), + idToken.bytesEnd() - idToken.bytesBegin()); if (identifier == QLatin1String("include") || identifier == QLatin1String("include_next") || (m_languageFeatures.objCEnabled && identifier == QLatin1String("import"))) { @@ -837,8 +838,8 @@ int CppCompletionAssistProcessor::startOfOperator(int pos, if (tokens.at(0).is(T_POUND) && tokens.at(1).is(T_IDENTIFIER) && (tokens.at(2).is(T_STRING_LITERAL) || tokens.at(2).is(T_ANGLE_STRING_LITERAL))) { const Token &directiveToken = tokens.at(1); - QString directive = tc.block().text().mid(directiveToken.begin(), - directiveToken.length()); + QString directive = tc.block().text().mid(directiveToken.bytesBegin(), + directiveToken.bytes()); if (directive == QLatin1String("include") || directive == QLatin1String("include_next") || directive == QLatin1String("import")) { @@ -991,7 +992,7 @@ bool CppCompletionAssistProcessor::tryObjCCompletion() if (start == tokens.startToken()) return false; - const int startPos = tokens[start].begin() + tokens.startPosition(); + const int startPos = tokens[start].bytesBegin() + tokens.startPosition(); const QString expr = m_interface->textAt(startPos, m_interface->position() - startPos); Document::Ptr thisDocument = m_interface->snapshot().document(m_interface->fileName()); |