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

10
src/plugins/texteditor/texteditor.cpp
View File

@@ -37,7 +37,6 @@
#include "circularclipboardassist.h"
#include "codecselector.h"
#include "completionsettings.h"
#include "convenience.h"
#include "highlighterutils.h"
#include "icodestylepreferences.h"
#include "indenter.h"
@@ -77,6 +76,7 @@
#include <coreplugin/find/highlightscrollbar.h>
#include <utils/algorithm.h>
#include <utils/asconst.h>
#include <utils/textutils.h>
#include <utils/linecolumnlabel.h>
#include <utils/fileutils.h>
#include <utils/dropsupport.h>
@@ -267,7 +267,7 @@ public:
// Does the last handler still applies?
const int documentRevision = textCursor.document()->revision();
const int position = Convenience::wordStartCursor(textCursor).position();
const int position = Text::wordStartCursor(textCursor).position();
if (m_lastHandlerInfo.applies(documentRevision, position)) {
m_lastHandlerInfo.handler->showToolTip(m_widget, point, /*decorate=*/ false);
return;
@@ -1448,7 +1448,7 @@ bool TextEditorWidget::selectBlockUp()
if (!TextBlockUserData::findNextClosingParenthesis(&cursor, true))
return false;
setTextCursor(Convenience::flippedCursor(cursor));
setTextCursor(Text::flippedCursor(cursor));
d->_q_matchParentheses();
return true;
}
@@ -1473,7 +1473,7 @@ bool TextEditorWidget::selectBlockDown()
if ( cursor != d->m_selectBlockAnchor)
TextBlockUserData::findNextClosingParenthesis(&cursor, true);
setTextCursor(Convenience::flippedCursor(cursor));
setTextCursor(Text::flippedCursor(cursor));
d->_q_matchParentheses();
return true;
}
@@ -2802,7 +2802,7 @@ QRect TextEditorWidget::cursorRect(int pos) const
void TextEditorWidget::convertPosition(int pos, int *line, int *column) const
{
Convenience::convertPosition(document(), pos, line, column);
Text::convertPosition(document(), pos, line, column);
}
bool TextEditorWidget::event(QEvent *e)