From 7b246155559cd079e777a1814ce030763c0411ed Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Tue, 2 Apr 2013 14:01:12 +0200
Subject: [PATCH] Forward-declare some classes in Find plugin.

Change-Id: I198165cb4c06fe11535d0d794ca1dda17eaec052
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
 src/plugins/find/findtoolwindow.cpp      |  1 +
 src/plugins/find/findtoolwindow.h        |  2 +-
 src/plugins/find/ifindfilter.cpp         |  1 +
 src/plugins/find/ifindfilter.h           |  3 +--
 src/plugins/find/searchresulttreemodel.h |  2 --
 src/plugins/find/searchresultwidget.cpp  |  5 +++++
 src/plugins/find/searchresultwidget.h    | 13 ++++++++-----
 src/plugins/find/searchresultwindow.cpp  |  1 +
 src/plugins/find/treeviewfind.cpp        |  1 +
 src/plugins/find/treeviewfind.h          |  3 +--
 10 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/plugins/find/findtoolwindow.cpp b/src/plugins/find/findtoolwindow.cpp
index 1707eaeeda..750de78865 100644
--- a/src/plugins/find/findtoolwindow.cpp
+++ b/src/plugins/find/findtoolwindow.cpp
@@ -28,6 +28,7 @@
 ****************************************************************************/
 
 #include "findtoolwindow.h"
+#include "ifindfilter.h"
 #include "findplugin.h"
 
 #include <coreplugin/icore.h>
diff --git a/src/plugins/find/findtoolwindow.h b/src/plugins/find/findtoolwindow.h
index 64b45be577..14380b0724 100644
--- a/src/plugins/find/findtoolwindow.h
+++ b/src/plugins/find/findtoolwindow.h
@@ -31,7 +31,6 @@
 #define FINDTOOLWINDOW_H
 
 #include "ui_finddialog.h"
-#include "ifindfilter.h"
 
 #include <QList>
 
@@ -39,6 +38,7 @@ QT_FORWARD_DECLARE_CLASS(QCompleter)
 
 namespace Find {
 class FindPlugin;
+class IFindFilter;
 
 namespace Internal {
 
diff --git a/src/plugins/find/ifindfilter.cpp b/src/plugins/find/ifindfilter.cpp
index f126b12afc..7e34177bec 100644
--- a/src/plugins/find/ifindfilter.cpp
+++ b/src/plugins/find/ifindfilter.cpp
@@ -30,6 +30,7 @@
 #include "ifindfilter.h"
 
 #include <QPainter>
+#include <QPixmap>
 
 /*!
     \class Find::IFindFilter
diff --git a/src/plugins/find/ifindfilter.h b/src/plugins/find/ifindfilter.h
index 219f0143a2..ce58e58394 100644
--- a/src/plugins/find/ifindfilter.h
+++ b/src/plugins/find/ifindfilter.h
@@ -33,12 +33,11 @@
 #include "find_global.h"
 #include "textfindconstants.h"
 
-#include <QPixmap>
-
 QT_BEGIN_NAMESPACE
 class QWidget;
 class QSettings;
 class QKeySequence;
+class Pixmap;
 QT_END_NAMESPACE
 
 namespace Find {
diff --git a/src/plugins/find/searchresulttreemodel.h b/src/plugins/find/searchresulttreemodel.h
index d52326dc14..8286fba317 100644
--- a/src/plugins/find/searchresulttreemodel.h
+++ b/src/plugins/find/searchresulttreemodel.h
@@ -34,9 +34,7 @@
 #include "searchresultcolor.h"
 
 #include <QAbstractItemModel>
-#include <QRegExp>
 #include <QFont>
-#include <QTextDocument>
 
 namespace Find {
 namespace Internal {
diff --git a/src/plugins/find/searchresultwidget.cpp b/src/plugins/find/searchresultwidget.cpp
index bc7aa6e549..058366c78d 100644
--- a/src/plugins/find/searchresultwidget.cpp
+++ b/src/plugins/find/searchresultwidget.cpp
@@ -43,6 +43,11 @@
 
 #include <QDir>
 #include <QSettings>
+#include <QFrame>
+#include <QLabel>
+#include <QLineEdit>
+#include <QToolButton>
+#include <QCheckBox>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 
diff --git a/src/plugins/find/searchresultwidget.h b/src/plugins/find/searchresultwidget.h
index a3cf60fbf5..758b2b08b3 100644
--- a/src/plugins/find/searchresultwidget.h
+++ b/src/plugins/find/searchresultwidget.h
@@ -34,12 +34,15 @@
 
 #include <coreplugin/infobar.h>
 
-#include <QFrame>
-#include <QLabel>
-#include <QLineEdit>
-#include <QToolButton>
 #include <QWidget>
-#include <QCheckBox>
+
+QT_BEGIN_NAMESPACE
+class QFrame;
+class QLabel;
+class QLineEdit;
+class QToolButton;
+class QCheckBox;
+QT_END_NAMESPACE
 
 namespace Find {
 namespace Internal {
diff --git a/src/plugins/find/searchresultwindow.cpp b/src/plugins/find/searchresultwindow.cpp
index e47d493391..58c17b9dea 100644
--- a/src/plugins/find/searchresultwindow.cpp
+++ b/src/plugins/find/searchresultwindow.cpp
@@ -45,6 +45,7 @@
 #include <QVBoxLayout>
 #include <QFont>
 #include <QAction>
+#include <QToolButton>
 #include <QComboBox>
 #include <QScrollArea>
 #include <QStackedWidget>
diff --git a/src/plugins/find/treeviewfind.cpp b/src/plugins/find/treeviewfind.cpp
index 292e075e35..fe803f07a8 100644
--- a/src/plugins/find/treeviewfind.cpp
+++ b/src/plugins/find/treeviewfind.cpp
@@ -31,6 +31,7 @@
 
 #include <QTreeView>
 #include <QTextCursor>
+#include <QModelIndex>
 
 namespace Find {
 
diff --git a/src/plugins/find/treeviewfind.h b/src/plugins/find/treeviewfind.h
index 7fa9ba36d6..aec6312f20 100644
--- a/src/plugins/find/treeviewfind.h
+++ b/src/plugins/find/treeviewfind.h
@@ -32,10 +32,9 @@
 
 #include "ifindsupport.h"
 
-#include <QModelIndex>
-
 QT_BEGIN_NAMESPACE
 class QTreeView;
+class QModelIndex;
 QT_END_NAMESPACE
 
 namespace Find {
-- 
GitLab