diff options
author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2017-09-21 12:35:24 +0200 |
---|---|---|
committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2017-09-22 12:59:35 +0000 |
commit | 80a472740d62f0e0b1ffc177c75641691e99e213 (patch) | |
tree | 370c5bca8ebcb64b85845751b8dd9dc97de0655f /src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp | |
parent | a959fe59da71289cb52b6c006d8ec7bc70362ad8 (diff) | |
download | qt-creator-80a472740d62f0e0b1ffc177c75641691e99e213.tar.gz |
TextEditor: move convenience from texteditor to utils
Allows to use this header without texteditor dependency.
Change-Id: I706f42799c3ea42473a716fa9ef9f3cfbef6fdd4
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp')
-rw-r--r-- | src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp index 13d8f5531d..e60ac37ec6 100644 --- a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp +++ b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp @@ -42,7 +42,6 @@ #include <texteditor/codeassist/assistproposalitem.h> #include <texteditor/codeassist/functionhintproposal.h> #include <texteditor/codeassist/ifunctionhintproposalmodel.h> -#include <texteditor/convenience.h> #include <cplusplus/BackwardsScanner.h> #include <cplusplus/ExpressionUnderCursor.h> @@ -52,6 +51,7 @@ #include <clangsupport/filecontainer.h> #include <utils/algorithm.h> +#include <utils/textutils.h> #include <utils/mimetypes/mimedatabase.h> #include <utils/qtcassert.h> @@ -556,10 +556,7 @@ ClangCompletionAssistProcessor::extractLineColumn(int position) return {-1, -1}; int line = -1, column = -1; - TextEditor::Convenience::convertPosition(m_interface->textDocument(), - position, - &line, - &column); + ::Utils::Text::convertPosition(m_interface->textDocument(), position, &line, &column); const QTextBlock block = m_interface->textDocument()->findBlock(position); column += ClangCodeModel::Utils::extraUtf8CharsShift(block.text(), column) + 1; return {line, column}; |