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

TextEditor: move convenience from texteditor to utils

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cppeditor/cppeditorwidget.cpp
View File

@@ -69,7 +69,6 @@
#include <texteditor/codeassist/genericproposal.h>
#include <texteditor/codeassist/genericproposalmodel.h>
#include <texteditor/completionsettings.h>
#include <texteditor/convenience.h>
#include <texteditor/fontsettings.h>
#include <texteditor/refactoroverlay.h>
#include <texteditor/textdocument.h>
@@ -81,6 +80,7 @@
#include <cplusplus/ASTPath.h>
#include <cplusplus/FastPreprocessor.h>
#include <cplusplus/MatchingText.h>
#include <utils/textutils.h>
#include <utils/qtcassert.h>
#include <utils/utilsicons.h>
@@ -474,7 +474,7 @@ ProjectPart *CppEditorWidget::projectPart() const
namespace {
using ClangBackEnd::V2::SourceLocationContainer;
using TextEditor::Convenience::selectAt;
using Utils::Text::selectAt;
QTextCharFormat occurrencesTextCharFormat()
{
@@ -910,7 +910,7 @@ void CppEditorWidget::onRefactorMarkerClicked(const RefactorMarker &marker)
applyDeclDefLinkChanges(true);
} else if (isClangFixItAvailableMarker(marker)) {
int line, column;
if (Convenience::convertPosition(document(), marker.cursor.position(), &line, &column)) {
if (Utils::Text::convertPosition(document(), marker.cursor.position(), &line, &column)) {
setTextCursor(marker.cursor);
invokeAssist(TextEditor::QuickFix);
}