From 766b222d8f92dc34cd617c90b594d018b8dc0788 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@theqtcompany.com>
Date: Tue, 21 Apr 2015 12:39:01 +0200
Subject: [PATCH] Editor: Move inFindScope back to exported class.

To allow invoking it from BaseTextFind.

Task-number: QTCREATORBUG-14300
Change-Id: Id9f553d166f7b929e00238327e22d6a915957b77
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
---
 src/plugins/texteditor/texteditor.cpp | 27 ++++++++++++---------------
 src/plugins/texteditor/texteditor.h   |  3 +++
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index 968e8e5131b..d41176edb73 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -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)
diff --git a/src/plugins/texteditor/texteditor.h b/src/plugins/texteditor/texteditor.h
index ab3b6598153..8fa094d14ca 100644
--- a/src/plugins/texteditor/texteditor.h
+++ b/src/plugins/texteditor/texteditor.h
@@ -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: