From e59ad83d530fe879a0954875e7a4a2704a20296e Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Thu, 4 Apr 2013 11:26:43 +0200
Subject: [PATCH] Clean headers in Designer.

Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: Ia97b5bd9e4496cd824f35c5fda8ccf0db9af471c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
 src/plugins/designer/codemodelhelpers.cpp        | 10 ----------
 src/plugins/designer/cpp/formclasswizard.cpp     |  3 ---
 .../designer/cpp/formclasswizarddialog.cpp       |  1 -
 src/plugins/designer/cpp/formclasswizardpage.cpp |  3 ---
 src/plugins/designer/designercontext.cpp         |  2 --
 src/plugins/designer/designercontext.h           |  2 --
 src/plugins/designer/editorwidget.cpp            |  3 ---
 src/plugins/designer/formeditorfactory.cpp       |  3 ---
 src/plugins/designer/formeditorplugin.cpp        |  8 --------
 src/plugins/designer/formeditorstack.cpp         |  2 --
 src/plugins/designer/formeditorstack.h           |  1 -
 src/plugins/designer/formeditorw.cpp             |  6 ------
 src/plugins/designer/formeditorw.h               |  1 -
 src/plugins/designer/formtemplatewizardpage.cpp  |  2 --
 src/plugins/designer/formwindoweditor.cpp        |  7 -------
 src/plugins/designer/formwindowfile.cpp          |  6 ------
 src/plugins/designer/formwizard.cpp              |  1 -
 src/plugins/designer/formwizarddialog.cpp        |  2 --
 src/plugins/designer/qtcreatorintegration.cpp    | 16 ----------------
 src/plugins/designer/qtcreatorintegration.h      |  2 +-
 .../qtdesignerformclasscodegenerator.cpp         |  1 -
 src/plugins/designer/settingsmanager.cpp         |  1 -
 src/plugins/designer/settingspage.cpp            |  3 ---
 23 files changed, 1 insertion(+), 85 deletions(-)

diff --git a/src/plugins/designer/codemodelhelpers.cpp b/src/plugins/designer/codemodelhelpers.cpp
index 19ec99ad97b..acfe67dd82f 100644
--- a/src/plugins/designer/codemodelhelpers.cpp
+++ b/src/plugins/designer/codemodelhelpers.cpp
@@ -30,20 +30,10 @@
 #include "codemodelhelpers.h"
 
 #include <cpptools/ModelManagerInterface.h>
-#include <cplusplus/Symbols.h>
-#include <cplusplus/CoreTypes.h>
-#include <cplusplus/Name.h>
-#include <cplusplus/Names.h>
-#include <cplusplus/Literals.h>
-#include <cplusplus/Scope.h>
-#include <cplusplus/Control.h>
-#include <cplusplus/SymbolVisitor.h>
 
-#include <coreplugin/icore.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/session.h>
-#include <utils/qtcassert.h>
 
 #include <QCoreApplication>
 #include <QDebug>
diff --git a/src/plugins/designer/cpp/formclasswizard.cpp b/src/plugins/designer/cpp/formclasswizard.cpp
index e21183a62e4..582318b54f5 100644
--- a/src/plugins/designer/cpp/formclasswizard.cpp
+++ b/src/plugins/designer/cpp/formclasswizard.cpp
@@ -30,15 +30,12 @@
 #include "formclasswizard.h"
 #include "formclasswizarddialog.h"
 #include "designerconstants.h"
-#include "formwindoweditor.h"
 #include "qtdesignerformclasscodegenerator.h"
 #include <qtsupport/qtsupportconstants.h>
 
-#include <coreplugin/icore.h>
 #include <cppeditor/cppeditorconstants.h>
 
 #include <QDebug>
-#include <QSettings>
 
 namespace Designer {
 namespace Internal {
diff --git a/src/plugins/designer/cpp/formclasswizarddialog.cpp b/src/plugins/designer/cpp/formclasswizarddialog.cpp
index 359cbd4f83a..67c636044f7 100644
--- a/src/plugins/designer/cpp/formclasswizarddialog.cpp
+++ b/src/plugins/designer/cpp/formclasswizarddialog.cpp
@@ -35,7 +35,6 @@
 #include <coreplugin/basefilewizard.h>
 
 #include <QDebug>
-#include <QAbstractButton>
 
 enum { FormPageId, ClassPageId };
 
diff --git a/src/plugins/designer/cpp/formclasswizardpage.cpp b/src/plugins/designer/cpp/formclasswizardpage.cpp
index 146fdc02744..7feb379f776 100644
--- a/src/plugins/designer/cpp/formclasswizardpage.cpp
+++ b/src/plugins/designer/cpp/formclasswizardpage.cpp
@@ -33,13 +33,10 @@
 
 #include <coreplugin/icore.h>
 #include <coreplugin/mimedatabase.h>
-#include <cppeditor/cppeditorconstants.h>
 #include <cpptools/cpptoolsconstants.h>
 
 #include <QDebug>
-#include <QSettings>
 
-#include <QAbstractButton>
 #include <QMessageBox>
 
 namespace Designer {
diff --git a/src/plugins/designer/designercontext.cpp b/src/plugins/designer/designercontext.cpp
index 6d86a485e4f..512067af3ac 100644
--- a/src/plugins/designer/designercontext.cpp
+++ b/src/plugins/designer/designercontext.cpp
@@ -28,7 +28,6 @@
 ****************************************************************************/
 
 #include "designercontext.h"
-#include "designerconstants.h"
 #include "formeditorw.h"
 
 #include <QDesignerFormEditorInterface>
@@ -41,7 +40,6 @@
 
 #include <QWidget>
 #include <QDebug>
-#include <QSettings>
 
 enum { debug = 0 };
 
diff --git a/src/plugins/designer/designercontext.h b/src/plugins/designer/designercontext.h
index 3a70f5ee44c..658b5d0a212 100644
--- a/src/plugins/designer/designercontext.h
+++ b/src/plugins/designer/designercontext.h
@@ -32,8 +32,6 @@
 
 #include <coreplugin/icontext.h>
 
-#include <QList>
-
 namespace Designer {
 namespace Internal {
 
diff --git a/src/plugins/designer/editorwidget.cpp b/src/plugins/designer/editorwidget.cpp
index 389b1e07022..d1d7a1798d8 100644
--- a/src/plugins/designer/editorwidget.cpp
+++ b/src/plugins/designer/editorwidget.cpp
@@ -33,9 +33,6 @@
 
 #include <coreplugin/editormanager/ieditor.h>
 
-#include <utils/qtcassert.h>
-
-#include <QVBoxLayout>
 #include <QDockWidget>
 #include <QAbstractItemView>
 
diff --git a/src/plugins/designer/formeditorfactory.cpp b/src/plugins/designer/formeditorfactory.cpp
index 622f2e853a3..736a033d473 100644
--- a/src/plugins/designer/formeditorfactory.cpp
+++ b/src/plugins/designer/formeditorfactory.cpp
@@ -31,18 +31,15 @@
 #include "formeditorw.h"
 #include "formwindoweditor.h"
 #include "editordata.h"
-#include "designerconstants.h"
 #include "designerxmleditor.h"
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/infobar.h>
 #include <coreplugin/fileiconprovider.h>
-#include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/modemanager.h>
 
 #include <QCoreApplication>
-#include <QFileInfo>
 #include <QDebug>
 
 using namespace Designer::Constants;
diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp
index f56ce14d914..ce8bb2df7b4 100644
--- a/src/plugins/designer/formeditorplugin.cpp
+++ b/src/plugins/designer/formeditorplugin.cpp
@@ -38,26 +38,18 @@
 #endif
 
 #include "settingspage.h"
-#include "designerconstants.h"
 #include "qtdesignerformclasscodegenerator.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/mimedatabase.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/designmode.h>
-#include <coreplugin/id.h>
-#include <extensionsystem/pluginmanager.h>
 
 #include <QDebug>
 #include <QLibraryInfo>
 #include <QTranslator>
 #include <QtPlugin>
 
-#ifdef CPP_ENABLED
-#    include <QWizard>
-#    include <QMainWindow>
-#endif
-
 using namespace Designer::Internal;
 using namespace Designer::Constants;
 
diff --git a/src/plugins/designer/formeditorstack.cpp b/src/plugins/designer/formeditorstack.cpp
index 6d15ba8c8e5..2b441fa71d8 100644
--- a/src/plugins/designer/formeditorstack.cpp
+++ b/src/plugins/designer/formeditorstack.cpp
@@ -30,7 +30,6 @@
 #include "formeditorstack.h"
 #include "formwindoweditor.h"
 #include "formeditorw.h"
-#include "designerconstants.h"
 
 #include <widgethost.h>
 
@@ -46,7 +45,6 @@
 #include <QDesignerPropertyEditorInterface>
 
 #include <QDebug>
-#include <QVariant>
 #include <QRect>
 
 namespace Designer {
diff --git a/src/plugins/designer/formeditorstack.h b/src/plugins/designer/formeditorstack.h
index addf22da6e4..9f10df2755b 100644
--- a/src/plugins/designer/formeditorstack.h
+++ b/src/plugins/designer/formeditorstack.h
@@ -34,7 +34,6 @@
 
 #include <QStackedWidget>
 #include <QList>
-#include <QString>
 
 QT_BEGIN_NAMESPACE
 class QDesignerFormWindowInterface;
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index 423321a93fc..a5dbb9203af 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -29,7 +29,6 @@
 
 #include "formeditorw.h"
 #include "formwindoweditor.h"
-#include "designerconstants.h"
 #include "settingsmanager.h"
 #include "settingspage.h"
 #include "editorwidget.h"
@@ -47,14 +46,10 @@
 #include <coreplugin/helpmanager.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
-#include <coreplugin/actionmanager/command.h>
-#include <coreplugin/id.h>
-#include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/minisplitter.h>
 #include <coreplugin/mimedatabase.h>
 #include <coreplugin/outputpane.h>
 #include <texteditor/texteditorsettings.h>
-#include <extensionsystem/pluginmanager.h>
 #include <cpptools/cpptoolsconstants.h>
 #include <utils/qtcassert.h>
 
@@ -81,7 +76,6 @@
 #include <QApplication>
 #include <QCursor>
 #include <QDockWidget>
-#include <QMenu>
 #include <QMessageBox>
 #include <QKeySequence>
 #include <QPrintDialog>
diff --git a/src/plugins/designer/formeditorw.h b/src/plugins/designer/formeditorw.h
index dad69544ba3..eeabafb47c4 100644
--- a/src/plugins/designer/formeditorw.h
+++ b/src/plugins/designer/formeditorw.h
@@ -37,7 +37,6 @@
 
 #include <QMap>
 #include <QObject>
-#include <QStringList>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/designer/formtemplatewizardpage.cpp b/src/plugins/designer/formtemplatewizardpage.cpp
index 9ed11dbf5ce..be34106365b 100644
--- a/src/plugins/designer/formtemplatewizardpage.cpp
+++ b/src/plugins/designer/formtemplatewizardpage.cpp
@@ -29,7 +29,6 @@
 
 #include "formtemplatewizardpage.h"
 #include "formeditorw.h"
-#include "designerconstants.h"
 
 #if QT_VERSION >= 0x050000
 #    include <QDesignerNewFormWidgetInterface>
@@ -45,7 +44,6 @@
 
 #include <QVBoxLayout>
 #include <QMessageBox>
-#include <QAbstractButton>
 
 #ifdef USE_XSLT
 #    include <QXmlQuery>
diff --git a/src/plugins/designer/formwindoweditor.cpp b/src/plugins/designer/formwindoweditor.cpp
index ef1d96572d2..53e25edb0d5 100644
--- a/src/plugins/designer/formwindoweditor.cpp
+++ b/src/plugins/designer/formwindoweditor.cpp
@@ -32,17 +32,11 @@
 #include "designerconstants.h"
 #include "resourcehandler.h"
 #include "designerxmleditor.h"
-#include <widgethost.h>
 
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
-#include <coreplugin/mimedatabase.h>
 #include <texteditor/basetextdocument.h>
-#include <texteditor/plaintexteditor.h>
 
 #include <utils/qtcassert.h>
-#include <utils/fileutils.h>
 
 #if QT_VERSION >= 0x050000
 #    include <QDesignerFormWindowInterface>
@@ -53,7 +47,6 @@
 
 #include <QDebug>
 #include <QFileInfo>
-#include <QFile>
 #include <QApplication>
 
 namespace Designer {
diff --git a/src/plugins/designer/formwindowfile.cpp b/src/plugins/designer/formwindowfile.cpp
index e1df0bf79cd..fcb394ebf4e 100644
--- a/src/plugins/designer/formwindowfile.cpp
+++ b/src/plugins/designer/formwindowfile.cpp
@@ -30,9 +30,6 @@
 #include "formwindowfile.h"
 #include "designerconstants.h"
 
-#include <coreplugin/icore.h>
-#include <utils/reloadpromptutils.h>
-#include <utils/fileutils.h>
 #include <utils/qtcassert.h>
 
 #include <QDesignerFormWindowInterface>
@@ -42,12 +39,9 @@
 #    include "qt_private/qsimpleresource_p.h"
 #endif
 
-#include <QMessageBox>
 #include <QUndoStack>
 
-#include <QFile>
 #include <QFileInfo>
-#include <QByteArray>
 #include <QDebug>
 #include <QTextCodec>
 
diff --git a/src/plugins/designer/formwizard.cpp b/src/plugins/designer/formwizard.cpp
index 94f5acddf36..0057c7bc21c 100644
--- a/src/plugins/designer/formwizard.cpp
+++ b/src/plugins/designer/formwizard.cpp
@@ -29,7 +29,6 @@
 
 #include "formwizard.h"
 #include "formwizarddialog.h"
-#include "formwindoweditor.h"
 #include "designerconstants.h"
 #include <qtsupport/qtsupportconstants.h>
 
diff --git a/src/plugins/designer/formwizarddialog.cpp b/src/plugins/designer/formwizarddialog.cpp
index 015bfdefc59..a9b8407dfe1 100644
--- a/src/plugins/designer/formwizarddialog.cpp
+++ b/src/plugins/designer/formwizarddialog.cpp
@@ -29,9 +29,7 @@
 
 #include "formwizarddialog.h"
 #include "formtemplatewizardpage.h"
-#include "formeditorw.h"
 
-#include <coreplugin/icore.h>
 #include <coreplugin/basefilewizard.h>
 
 #include <utils/filewizardpage.h>
diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp
index 88ed8db18a9..8de9347ea0d 100644
--- a/src/plugins/designer/qtcreatorintegration.cpp
+++ b/src/plugins/designer/qtcreatorintegration.cpp
@@ -28,37 +28,21 @@
 ****************************************************************************/
 
 #include "qtcreatorintegration.h"
-#include "formeditorplugin.h"
 #include "formwindoweditor.h"
 #include "formclasswizardpage.h"
 #include "formeditorw.h"
 #include "editordata.h"
-#include "codemodelhelpers.h"
 #include <widgethost.h>
 
-#include <cpptools/cpprefactoringchanges.h>
 #include <cpptools/cpptoolsconstants.h>
 #include <cpptools/insertionpointlocator.h>
 #include <cpptools/symbolfinder.h>
-#include <cpptools/ModelManagerInterface.h>
-#include <cplusplus/Symbols.h>
 #include <cplusplus/Overview.h>
-#include <cplusplus/CoreTypes.h>
-#include <cplusplus/Name.h>
-#include <cplusplus/Names.h>
-#include <cplusplus/Literals.h>
-#include <cplusplus/Scope.h>
-#include <cplusplus/Control.h>
-#include <cplusplus/TranslationUnit.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/mimedatabase.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <extensionsystem/pluginmanager.h>
 #include <texteditor/basetexteditor.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
 #include <utils/qtcassert.h>
-#include <utils/fileutils.h>
 
 #include <QDesignerFormWindowInterface>
 #include <QDesignerFormEditorInterface>
diff --git a/src/plugins/designer/qtcreatorintegration.h b/src/plugins/designer/qtcreatorintegration.h
index 64c46b9f2e4..e7581d318c2 100644
--- a/src/plugins/designer/qtcreatorintegration.h
+++ b/src/plugins/designer/qtcreatorintegration.h
@@ -30,7 +30,7 @@
 #ifndef QTCREATORINTEGRATION_H
 #define QTCREATORINTEGRATION_H
 
-#include <cpptools/ModelManagerInterface.h>
+#include <QtGlobal>
 
 #if QT_VERSION >= 0x050000
 #    include <QDesignerIntegration>
diff --git a/src/plugins/designer/qtdesignerformclasscodegenerator.cpp b/src/plugins/designer/qtdesignerformclasscodegenerator.cpp
index 50837f5c9e5..3ba68a498ab 100644
--- a/src/plugins/designer/qtdesignerformclasscodegenerator.cpp
+++ b/src/plugins/designer/qtdesignerformclasscodegenerator.cpp
@@ -39,7 +39,6 @@
 #include <QSettings>
 #include <QFileInfo>
 #include <QDebug>
-#include <QSharedData>
 
 static const char uiMemberC[] = "ui";
 static const char uiNamespaceC[] = "Ui";
diff --git a/src/plugins/designer/settingsmanager.cpp b/src/plugins/designer/settingsmanager.cpp
index a499d00c2c8..3710c3100a6 100644
--- a/src/plugins/designer/settingsmanager.cpp
+++ b/src/plugins/designer/settingsmanager.cpp
@@ -28,7 +28,6 @@
 ****************************************************************************/
 
 #include "settingsmanager.h"
-#include "designerconstants.h"
 
 #include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/designer/settingspage.cpp b/src/plugins/designer/settingspage.cpp
index 76451aebf7c..7fe793f94cb 100644
--- a/src/plugins/designer/settingspage.cpp
+++ b/src/plugins/designer/settingspage.cpp
@@ -28,10 +28,8 @@
 ****************************************************************************/
 
 #include "settingspage.h"
-#include "designerconstants.h"
 #include "formeditorw.h"
 
-#include <extensionsystem/pluginmanager.h>
 #if QT_VERSION >= 0x050000
 #    include <QDesignerOptionsPageInterface>
 #else
@@ -39,7 +37,6 @@
 #endif
 
 #include <QCoreApplication>
-#include <QIcon>
 
 using namespace Designer::Internal;