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

Editor: Move inFindScope back to exported class.

Browse Source 
To allow invoking it from BaseTextFind.

Task-number: QTCREATORBUG-14300
Change-Id: Id9f553d166f7b929e00238327e22d6a915957b77
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
David Schulz
2015-04-21 12:39:01 +02:00
parent 1d3b4abbfc
commit 766b222d8f
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -298,9 +298,6 @@ public:
void transformSelection(TransformationMethod method);
void transformBlockSelection(TransformationMethod method);
bool inFindScope(const QTextCursor &cursor);
bool inFindScope(int selectionStart, int selectionEnd);
void slotUpdateExtraAreaWidth();
void slotUpdateRequest(const QRect &r, int dy);
void slotUpdateBlockNotify(const QTextBlock &);
@@ -3143,7 +3140,7 @@ void TextEditorWidgetPrivate::highlightSearchResults(const QTextBlock &block,
|| (idx + l < text.length() && text.at(idx + l).isLetterOrNumber())))
continue;
if (!inFindScope(blockPosition + idx, blockPosition + idx + l))
if (!q->inFindScope(blockPosition + idx, blockPosition + idx + l))
continue;
const QTextCharFormat &searchResultFormat
@@ -6923,30 +6920,30 @@ void TextBlockSelection::fromPostition(int positionBlock, int positionColumn,
this->anchorColumn = anchorColumn;
}
bool TextEditorWidgetPrivate::inFindScope(const QTextCursor &cursor)
bool TextEditorWidget::inFindScope(const QTextCursor &cursor)
{
if (cursor.isNull())
return false;
return inFindScope(cursor.selectionStart(), cursor.selectionEnd());
}
bool TextEditorWidgetPrivate::inFindScope(int selectionStart, int selectionEnd)
bool TextEditorWidget::inFindScope(int selectionStart, int selectionEnd)
{
if (m_findScopeStart.isNull())
if (d->m_findScopeStart.isNull())
return true; // no scope, everything is included
if (selectionStart < m_findScopeStart.position())
if (selectionStart < d->m_findScopeStart.position())
return false;
if (selectionEnd > m_findScopeEnd.position())
if (selectionEnd > d->m_findScopeEnd.position())
return false;
if (m_findScopeVerticalBlockSelectionFirstColumn < 0)
if (d->m_findScopeVerticalBlockSelectionFirstColumn < 0)
return true;
QTextBlock block = q->document()->findBlock(selectionStart);
if (block != q->document()->findBlock(selectionEnd))
QTextBlock block = document()->findBlock(selectionStart);
if (block != document()->findBlock(selectionEnd))
return false;
QString text = block.text();
const TabSettings &ts = m_document->tabSettings();
int startPosition = ts.positionAtColumn(text, m_findScopeVerticalBlockSelectionFirstColumn);
int endPosition = ts.positionAtColumn(text, m_findScopeVerticalBlockSelectionLastColumn);
const TabSettings &ts = d->m_document->tabSettings();
int startPosition = ts.positionAtColumn(text, d->m_findScopeVerticalBlockSelectionFirstColumn);
int endPosition = ts.positionAtColumn(text, d->m_findScopeVerticalBlockSelectionLastColumn);
if (selectionStart - block.position() < startPosition)
return false;
if (selectionEnd - block.position() > endPosition)

3
src/plugins/texteditor/texteditor.h
View File

@@ -623,6 +623,9 @@ protected slots:
virtual void slotCursorPositionChanged(); // Used in VcsBase
virtual void slotCodeStyleSettingsChanged(const QVariant &); // Used in CppEditor
bool inFindScope(const QTextCursor &cursor);
bool inFindScope(int selectionStart, int selectionEnd);
void doFoo();
private: