Further header cleanup.

Introduce some more private classes for the coreplugin,
use header include convention
<QtModule/QClass>, de-qobjectify VariableManager.

1 files changed, 8 insertions, 11 deletions

diff --git a/src/plugins/find/basetextfind.h b/src/plugins/find/basetextfind.h
index d632e730e8..b79415b763 100644
--- a/src/plugins/find/basetextfind.h
+++ b/src/plugins/find/basetextfind.h
@@ -33,23 +33,25 @@
 #include "find_global.h"
 #include "ifindsupport.h"
 
-#include <QtCore/QPointer>
-#include <QtGui/QTextCursor>
+#include <QtCore/QScopedPointer>
 
 QT_BEGIN_NAMESPACE
 class QPlainTextEdit;
 class QTextEdit;
+class QTextCursor;
 QT_END_NAMESPACE
 
 namespace Find {
+struct BaseTextFindPrivate;
 
 class FIND_EXPORT BaseTextFind : public Find::IFindSupport
 {
     Q_OBJECT
 
 public:
-    BaseTextFind(QPlainTextEdit *editor);
-    BaseTextFind(QTextEdit *editor);
+    explicit BaseTextFind(QPlainTextEdit *editor);
+    explicit BaseTextFind(QTextEdit *editor);
+    virtual ~BaseTextFind();
 
     bool supportsReplace() const;
     Find::FindFlags supportedFindFlags() const;
@@ -87,15 +89,10 @@ private:
     void setTextCursor(const QTextCursor&);
     QTextDocument *document() const;
     bool isReadOnly() const;
-    QPointer<QTextEdit> m_editor;
-    QPointer<QPlainTextEdit> m_plaineditor;
-    QTextCursor m_findScopeStart;
-    QTextCursor m_findScopeEnd;
-    int m_findScopeVerticalBlockSelectionFirstColumn;
-    int m_findScopeVerticalBlockSelectionLastColumn;
     bool inScope(int startPosition, int endPosition) const;
     QTextCursor findOne(const QRegExp &expr, const QTextCursor &from, QTextDocument::FindFlags options) const;
-    int m_incrementalStartPos;
+
+    QScopedPointer<BaseTextFindPrivate> d;
 };
 
 } // namespace Find