diff options
author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-02-01 13:27:50 +0100 |
---|---|---|
committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-02-01 14:14:15 +0000 |
commit | eb1f85a9718c8ad0c1ab056a39123127fdd4d10b (patch) | |
tree | 675e432392bd74288acb3d22fb71d3ed8f41d0cf /src/plugins/clangcodemodel/clangutils.cpp | |
parent | 4f20c0d4edef1d20c3321d375c7083b7b481fab3 (diff) |
Clang: simplify column convertion calls
Pass QTextBlock directly into clangColumn call.
Change-Id: I3410a82ed9a84da66e7b430e2aefce64ec459db8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/clangcodemodel/clangutils.cpp')
-rw-r--r-- | src/plugins/clangcodemodel/clangutils.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp index 30dbbe7b10..cebf0b8b4c 100644 --- a/src/plugins/clangcodemodel/clangutils.cpp +++ b/src/plugins/clangcodemodel/clangutils.cpp @@ -43,6 +43,7 @@ #include <QDir> #include <QFile> #include <QStringList> +#include <QTextBlock> using namespace ClangCodeModel; using namespace ClangCodeModel::Internal; @@ -190,14 +191,14 @@ void setLastSentDocumentRevision(const QString &filePath, uint revision) document->sendTracker().setLastSentRevision(int(revision)); } -int clangColumn(const QString &lineText, int cppEditorColumn) +int clangColumn(const QTextBlock &line, int cppEditorColumn) { // (1) cppEditorColumn is the actual column shown by CppEditor. // (2) The return value is the column in Clang which is the utf8 byte offset from the beginning // of the line. // Here we convert column from (1) to (2). // '+ 1' is for 1-based columns - return lineText.left(cppEditorColumn).toUtf8().size() + 1; + return line.text().left(cppEditorColumn).toUtf8().size() + 1; } } // namespace Utils |