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>
This commit is contained in:
Ivan Donchevskii
2017-09-21 12:35:24 +02:00
parent a959fe59da
commit 80a472740d
27 changed files with 89 additions and 99 deletions

View File

@@ -26,11 +26,11 @@
#include "clangeditordocumentprocessor.h"
#include "clangfollowsymbol.h"
#include <texteditor/convenience.h>
#include <texteditor/texteditor.h>
#include <clangsupport/highlightingmarkcontainer.h>
#include <utils/textutils.h>
#include <utils/algorithm.h>
namespace ClangCodeModel {
@@ -104,9 +104,9 @@ TextEditor::TextEditorWidget::Link ClangFollowSymbol::findLink(
bool)
{
int lineNumber = 0, positionInBlock = 0;
QTextCursor cursor = TextEditor::Convenience::wordStartCursor(data.cursor());
TextEditor::Convenience::convertPosition(cursor.document(), cursor.position(), &lineNumber,
&positionInBlock);
QTextCursor cursor = Utils::Text::wordStartCursor(data.cursor());
Utils::Text::convertPosition(cursor.document(), cursor.position(), &lineNumber,
&positionInBlock);
const uint line = lineNumber;
const uint column = positionInBlock + 1;