Purge out include files in exported headers

src/plugins/coreplugin/actionmanager/command.h

@@ -32,9 +32,14 @@
 
 #include <coreplugin/core_global.h>
 
-#include <QtGui/QAction>
-#include <QtGui/QShortcut>
-#include <QtGui/QKeySequence>
+#include <QtCore/QObject>
+
+QT_BEGIN_NAMESPACE
+class QAction;
+class QShortcut;
+class QKeySequence;
+QT_END_NAMESPACE
+
 
 namespace Core {
 

src/plugins/coreplugin/basemode.h

@@ -35,6 +35,7 @@
 
 #include <QtCore/QObject>
 #include <QtGui/QWidget>
+#include <QtGui/QIcon>
 
 namespace Core {
 

src/plugins/coreplugin/dialogs/ioptionspage.h

@@ -33,8 +33,10 @@
 #include <coreplugin/core_global.h>
 
 #include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+class QWidget;
+QT_END_NAMESPACE
 
 namespace Core {
 

src/plugins/coreplugin/editmode.cpp

@@ -37,6 +37,8 @@
 #include "outputpane.h"
 #include "navigationwidget.h"
 #include "rightpane.h"
+#include "ieditor.h"
+#include "ifile.h"
 
 #include <QtCore/QLatin1String>
 #include <QtGui/QHBoxLayout>

src/plugins/coreplugin/editormanager/editormanager.h

@@ -33,6 +33,7 @@
 #include "../core_global.h"
 
 #include <coreplugin/icorelistener.h>
+#include <coreplugin/ifile.h>
 
 #include <QtGui/QWidget>
 #include <QtCore/QList>

src/plugins/coreplugin/editormanager/editorview.cpp

@@ -34,6 +34,7 @@
 #include "openeditorsmodel.h"
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/editormanager/ieditor.h>
 
 #include <coreplugin/findplaceholder.h>
 #include <utils/qtcassert.h>

src/plugins/coreplugin/editormanager/ieditor.h

@@ -32,10 +32,11 @@
 
 #include <coreplugin/core_global.h>
 #include <coreplugin/icontext.h>
-#include <coreplugin/ifile.h>
 
 namespace Core {
 
+class IFile;
+
 class CORE_EXPORT IEditor : public IContext
 {
     Q_OBJECT

src/plugins/coreplugin/editormanager/ieditorfactory.h

@@ -31,16 +31,11 @@
 #define IEDITORFACTORY_H
 
 #include <coreplugin/ifilefactory.h>
-#include <coreplugin/editormanager/ieditor.h>
-
-#include <QtCore/QObject>
-
-QT_BEGIN_NAMESPACE
-class QWidget;
-QT_END_NAMESPACE
 
 namespace Core {
 
+class IEditor;
+
 class CORE_EXPORT IEditorFactory : public Core::IFileFactory
 {
     Q_OBJECT

src/plugins/coreplugin/editormanager/openeditorsmodel.cpp

@@ -29,6 +29,7 @@
 
 #include "openeditorsmodel.h"
 #include "ieditor.h"
+#include "ifile.h"
 
 #include <QtCore/QDir>
 #include <QtGui/QIcon>

src/plugins/coreplugin/filemanager.cpp

@@ -30,6 +30,7 @@
 #include "filemanager.h"
 
 #include "editormanager.h"
+#include "ieditor.h"
 #include "icore.h"
 #include "ifile.h"
 #include "iversioncontrol.h"

src/plugins/coreplugin/icorelistener.h

@@ -31,11 +31,10 @@
 #define ICORELISTENER_H
 
 #include "core_global.h"
-#include <coreplugin/editormanager/ieditor.h>
 #include <QtCore/QObject>
 
 namespace Core {
-
+class IEditor;
 /*!
   \class Core::ICoreListener
 

src/plugins/coreplugin/imode.h

@@ -34,10 +34,9 @@
 
 #include <coreplugin/core_global.h>
 
-#include <QtCore/QObject>
-#include <QtGui/QIcon>
-#include <QtGui/QKeySequence>
-#include <QtGui/QLayout>
+QT_BEGIN_NAMESPACE
+class QIcon;
+QT_END_NAMESPACE
 
 namespace Core {
 

src/plugins/coreplugin/ioutputpane.h

@@ -35,7 +35,10 @@
 #include <QtCore/QObject>
 #include <QtCore/QList>
 #include <QtCore/QString>
-#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+class QWidget;
+QT_END_NAMESPACE
 
 namespace Core {
 

src/plugins/coreplugin/mainwindow.cpp

@@ -85,6 +85,8 @@
 #include <QtGui/QShortcut>
 #include <QtGui/QStatusBar>
 #include <QtGui/QWizard>
+#include <QtGui/QPrinter>
+#include <QtGui/QToolButton>
 
 /*
 #ifdef Q_OS_UNIX

src/plugins/coreplugin/mainwindow.h

@@ -44,6 +44,8 @@
 QT_BEGIN_NAMESPACE
 class QSettings;
 class QShortcut;
+class QPrinter;
+class QToolButton;
 QT_END_NAMESPACE
 
 namespace Core {

src/plugins/coreplugin/manhattanstyle.h

@@ -32,8 +32,7 @@
 
 #include "core_global.h"
 
-#include <QStyle>
-#include <QWindowsStyle>
+#include <QtGui/QWindowsStyle>
 
 QT_BEGIN_NAMESPACE
 class QLinearGradient;

src/plugins/coreplugin/modemanager.cpp

@@ -49,6 +49,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QDebug>
 #include <QtCore/QSignalMapper>
+#include <QtGui/QShortcut>
 
 #include <QtGui/QAction>
 #include <QtGui/QTabWidget>

src/plugins/coreplugin/navigationwidget.cpp

@@ -38,6 +38,8 @@
 
 #include <extensionsystem/pluginmanager.h>
 
+#include <utils/styledbar.h>
+
 #include <QtCore/QDebug>
 #include <QtCore/QSettings>
 
@@ -45,6 +47,7 @@
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QResizeEvent>
 #include <QtGui/QToolButton>
+#include <QtGui/QShortcut>
 
 Q_DECLARE_METATYPE(Core::INavigationWidgetFactory *)
 

src/plugins/coreplugin/navigationwidget.h

@@ -31,20 +31,19 @@
 #define NAVIGATIONWIDGET_H
 
 #include <coreplugin/minisplitter.h>
-#include <utils/styledbar.h>
 
-#include <QtGui/QWidget>
 #include <QtGui/QComboBox>
-#include <QtGui/QSplitter>
-#include <QtGui/QToolButton>
 
 QT_BEGIN_NAMESPACE
 class QSettings;
 class QShortcut;
+class QToolButton;
 QT_END_NAMESPACE
 
 namespace Core {
-
+namespace Utils {
+class StyledBar;
+}
 class INavigationWidgetFactory;
 class IMode;
 class Command;

src/plugins/coreplugin/outputpane.cpp

@@ -38,6 +38,7 @@
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/findplaceholder.h>
+#include <coreplugin/editormanager/ieditor.h>
 
 #include <extensionsystem/pluginmanager.h>
 

src/plugins/coreplugin/progressmanager/futureprogress.cpp

@@ -33,6 +33,9 @@
 #include <QtGui/QColor>
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QMenu>
+#include <QtGui/QProgressBar>
+#include <QtGui/QHBoxLayout>
+
 
 using namespace Core;
 

src/plugins/coreplugin/progressmanager/futureprogress.h

@@ -36,11 +36,11 @@
 #include <QtCore/QFuture>
 #include <QtCore/QFutureWatcher>
 #include <QtGui/QWidget>
-#include <QtGui/QIcon>
-#include <QtGui/QAction>
-#include <QtGui/QProgressBar>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QHBoxLayout>
+
+QT_BEGIN_NAMESPACE
+class QProgressBar;
+class QHBoxLayout;
+QT_END_NAMESPACE
 
 class ProgressBar;
 

src/plugins/coreplugin/progressmanager/progressmanager.h

@@ -35,7 +35,6 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QFuture>
-#include <QtGui/QIcon>
 
 namespace Core {
 

src/plugins/coreplugin/rightpane.cpp

@@ -29,12 +29,16 @@
 
 #include "rightpane.h"
 
+#include <coreplugin/modemanager.h>
+#include <extensionsystem/pluginmanager.h>
+
+#include <QtCore/QSettings>
+
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QSplitter>
 #include <QtGui/QResizeEvent>
 #include <QtGui/QTextEdit>
-#include <coreplugin/modemanager.h>
-#include <extensionsystem/pluginmanager.h>
+
 
 using namespace Core;
 using namespace Core::Internal;

src/plugins/coreplugin/rightpane.h

@@ -33,7 +33,10 @@
 #include "core_global.h"
 
 #include <QtGui/QWidget>
-#include <QtCore/QSettings>
+
+QT_BEGIN_HEADER
+class QSettings;
+QT_END_HEADER
 
 namespace Core {
 

src/plugins/coreplugin/settingsdatabase.cpp

@@ -31,6 +31,10 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+
 #include <QtSql/QSqlDatabase>
 #include <QtSql/QSqlError>
 #include <QtSql/QSqlQuery>

src/plugins/coreplugin/sidebar.h

@@ -39,7 +39,6 @@
 
 QT_BEGIN_NAMESPACE
 class QSettings;
-class QComboBox;
 class QToolBar;
 class QAction;
 class QToolButton;

src/plugins/coreplugin/variablemanager.cpp

@@ -28,6 +28,9 @@
 **************************************************************************/
 
 #include "variablemanager.h"
+#include "ifile.h"
+
+#include <QtCore/QFileInfo>
 
 using namespace Core;
 

src/plugins/coreplugin/variablemanager.h

@@ -36,7 +36,10 @@
 #include <QtCore/QObject>
 #include <QtCore/QMap>
 #include <QtCore/QString>
-#include <QtCore/QFileInfo>
+
+QT_BEGIN_NAMESPACE
+class QFileInfo;
+QT_END_NAMESPACE
 
 namespace Core {