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

Find: Remove use of unsual QTextCursor constructors

Browse Source 
Change-Id: If3b86d49c5b87974f7d40fcfa75e4a303ba55c1a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
(cherry picked from commit 1edd6193ba)
This commit is contained in:
hjk
2016-01-29 11:00:56 +01:00
parent f64d7e6ad4
commit 6844d3f277
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/coreplugin/find/basetextfind.cpp
View File

@@ -39,10 +39,6 @@
#include <QPlainTextEdit> #include <QPlainTextEdit>
#include <QTextCursor> #include <QTextCursor>
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
#include <private/qtextcursor_p.h>
#endif
namespace Core { namespace Core {
struct BaseTextFindPrivate struct BaseTextFindPrivate
@@ -396,13 +392,10 @@ void BaseTextFind::defineFindScope()
{ {
QTextCursor cursor = textCursor(); QTextCursor cursor = textCursor();
if (cursor.hasSelection() && cursor.block() != cursor.document()->findBlock(cursor.anchor())) { if (cursor.hasSelection() && cursor.block() != cursor.document()->findBlock(cursor.anchor())) {
#if QT_VERSION >= QT_VERSION_CHECK(5,6,0) d->m_findScopeStart = cursor;
d->m_findScopeStart = QTextCursorPrivate::fromPosition(document()->docHandle(), qMax(0, cursor.selectionStart())); d->m_findScopeStart.setPosition(qMax(0, cursor.selectionStart()));
d->m_findScopeEnd = QTextCursorPrivate::fromPosition(document()->docHandle(), cursor.selectionEnd()); d->m_findScopeEnd = cursor;
#else d->m_findScopeEnd.setPosition(cursor.selectionEnd());
d->m_findScopeStart = QTextCursor(document()->docHandle(), qMax(0, cursor.selectionStart()));
d->m_findScopeEnd = QTextCursor(document()->docHandle(), cursor.selectionEnd());
#endif
d->m_findScopeVerticalBlockSelectionFirstColumn = -1; d->m_findScopeVerticalBlockSelectionFirstColumn = -1;
d->m_findScopeVerticalBlockSelectionLastColumn = -1; d->m_findScopeVerticalBlockSelectionLastColumn = -1;