From 735e609e007c5a9f1cf308ac4ff7c377d9536a1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Fri, 23 Jan 2009 13:03:36 +0100
Subject: [PATCH] Removed more icore.h includes from header files
---
src/plugins/coreplugin/basefilewizard.cpp | 9 +++++----
.../coreplugin/editormanager/editorsplitter.cpp | 9 ++++-----
src/plugins/coreplugin/filemanager.cpp | 7 ++++---
src/plugins/coreplugin/mainwindow.cpp | 10 +++++-----
src/plugins/coreplugin/mainwindow.h | 4 ++--
src/plugins/coreplugin/modemanager.cpp | 1 +
src/plugins/coreplugin/navigationwidget.cpp | 13 +++++++------
src/plugins/coreplugin/outputpane.cpp | 2 +-
.../coreplugin/scriptmanager/scriptmanager_p.h | 4 +++-
src/plugins/cppeditor/cppeditor.cpp | 4 ++--
src/plugins/designer/formeditorw.cpp | 1 +
src/plugins/designer/settingspage.h | 1 -
src/plugins/projectexplorer/buildmanager.cpp | 1 +
src/plugins/projectexplorer/projectexplorer.cpp | 3 ++-
src/plugins/projectexplorer/taskwindow.cpp | 1 +
src/plugins/projectexplorer/taskwindow.h | 1 -
.../qt4projectmanager/qt4buildconfigwidget.cpp | 1 +
src/plugins/quickopen/filesystemfilter.h | 1 -
src/plugins/quickopen/quickopenplugin.cpp | 3 ++-
src/plugins/quickopen/settingspage.h | 1 -
20 files changed, 42 insertions(+), 35 deletions(-)
diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp
index 7a7279cfe49..e98fd2ce8c9 100644
--- a/src/plugins/coreplugin/basefilewizard.cpp
+++ b/src/plugins/coreplugin/basefilewizard.cpp
@@ -32,12 +32,13 @@
***************************************************************************/
#include "basefilewizard.h"
+
+#include "coreconstants.h"
+#include "icore.h"
+#include "ifilewizardextension.h"
#include "mimedatabase.h"
+#include "editormanager/editormanager.h"
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/ifilewizardextension.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/filewizarddialog.h>
diff --git a/src/plugins/coreplugin/editormanager/editorsplitter.cpp b/src/plugins/coreplugin/editormanager/editorsplitter.cpp
index 7e4f53f4e40..5ff9832ec02 100644
--- a/src/plugins/coreplugin/editormanager/editorsplitter.cpp
+++ b/src/plugins/coreplugin/editormanager/editorsplitter.cpp
@@ -33,15 +33,14 @@
#include "editorsplitter.h"
+#include "coreconstants.h"
#include "editormanager.h"
+#include "icore.h"
#include "minisplitter.h"
#include "openeditorswindow.h"
#include "stackededitorgroup.h"
-
-#include <coreplugin/icore.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanager.h>
+#include "uniqueidmanager.h"
+#include "actionmanager/actionmanager.h"
#include <utils/qtcassert.h>
diff --git a/src/plugins/coreplugin/filemanager.cpp b/src/plugins/coreplugin/filemanager.cpp
index c503dbd7dd8..afafa92d757 100644
--- a/src/plugins/coreplugin/filemanager.cpp
+++ b/src/plugins/coreplugin/filemanager.cpp
@@ -33,13 +33,14 @@
#include "filemanager.h"
+#include "editormanager.h"
+#include "icore.h"
#include "ifile.h"
+#include "iversioncontrol.h"
#include "mainwindow.h"
+#include "mimedatabase.h"
#include "saveitemsdialog.h"
#include "vcsmanager.h"
-#include "editormanager.h"
-#include "mimedatabase.h"
-#include "iversioncontrol.h"
#include <utils/qtcassert.h>
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index bf36602e342..68cea956947 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -380,7 +380,7 @@ void MainWindow::registerDefaultContainers()
menubar->appendGroup(Constants::G_WINDOW);
menubar->appendGroup(Constants::G_HELP);
- //File Menu
+ // File Menu
ActionContainer *filemenu = am->createMenu(Constants::M_FILE);
menubar->addMenu(filemenu, Constants::G_FILE);
filemenu->menu()->setTitle(tr("&File"));
@@ -394,7 +394,7 @@ void MainWindow::registerDefaultContainers()
connect(filemenu->menu(), SIGNAL(aboutToShow()), this, SLOT(aboutToShowRecentFiles()));
- //Edit Menu
+ // Edit Menu
ActionContainer *medit = am->createMenu(Constants::M_EDIT);
menubar->addMenu(medit, Constants::G_EDIT);
medit->menu()->setTitle(tr("&Edit"));
@@ -405,12 +405,12 @@ void MainWindow::registerDefaultContainers()
medit->appendGroup(Constants::G_EDIT_FIND);
medit->appendGroup(Constants::G_EDIT_OTHER);
- //Tools Menu
+ // Tools Menu
ActionContainer *ac = am->createMenu(Constants::M_TOOLS);
menubar->addMenu(ac, Constants::G_TOOLS);
ac->menu()->setTitle(tr("&Tools"));
- //Window Menu
+ // Window Menu
ActionContainer *mwindow = am->createMenu(Constants::M_WINDOW);
menubar->addMenu(mwindow, Constants::G_WINDOW);
mwindow->menu()->setTitle(tr("&Window"));
@@ -423,7 +423,7 @@ void MainWindow::registerDefaultContainers()
mwindow->appendGroup(Constants::G_WINDOW_OTHER);
mwindow->appendGroup(Constants::G_WINDOW_LIST);
- //Help Menu
+ // Help Menu
ac = am->createMenu(Constants::M_HELP);
menubar->addMenu(ac, Constants::G_HELP);
ac->menu()->setTitle(tr("&Help"));
diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h
index e1fb1d9c662..4fa8f7472c1 100644
--- a/src/plugins/coreplugin/mainwindow.h
+++ b/src/plugins/coreplugin/mainwindow.h
@@ -34,7 +34,7 @@
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
-#include "icore.h"
+#include "core_global.h"
#include <QtGui/QMainWindow>
#include <QtCore/QMap>
@@ -61,6 +61,7 @@ class BaseView;
class EditorManager;
class FileManager;
class IContext;
+class IWizard;
class MessageManager;
class MimeDatabase;
class ModeManager;
@@ -103,7 +104,6 @@ public:
void openFiles(const QStringList &fileNames);
- //ICore
inline ExtensionSystem::PluginManager *pluginManager() { return m_pluginManager; }
Core::ActionManager *actionManager() const;
Core::FileManager *fileManager() const;
diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp
index 64006ff7236..05c47261f3a 100644
--- a/src/plugins/coreplugin/modemanager.cpp
+++ b/src/plugins/coreplugin/modemanager.cpp
@@ -35,6 +35,7 @@
#include "fancytabwidget.h"
#include "fancyactionbar.h"
+#include "icore.h"
#include "mainwindow.h"
#include <aggregation/aggregate.h>
diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index 1141909aa0c..6329f70ed94 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -33,12 +33,13 @@
#include "navigationwidget.h"
-#include <coreplugin/icore.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/inavigationwidgetfactory.h>
-#include <coreplugin/modemanager.h>
-#include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanager.h>
+#include "icore.h"
+#include "coreconstants.h"
+#include "inavigationwidgetfactory.h"
+#include "modemanager.h"
+#include "uniqueidmanager.h"
+#include "actionmanager/actionmanager.h"
+
#include <extensionsystem/pluginmanager.h>
#include <QtCore/QDebug>
diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp
index d85ecd2579d..52dec2a22ff 100644
--- a/src/plugins/coreplugin/outputpane.cpp
+++ b/src/plugins/coreplugin/outputpane.cpp
@@ -33,6 +33,7 @@
#include "outputpane.h"
#include "coreconstants.h"
+#include "icore.h"
#include "ioutputpane.h"
#include "mainwindow.h"
#include "modemanager.h"
@@ -55,7 +56,6 @@
#include <QtGui/QToolBar>
#include <QtGui/QToolButton>
#include <QtGui/QStackedWidget>
-#include <QDebug>
using namespace Core;
using namespace Core::Internal;
diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanager_p.h b/src/plugins/coreplugin/scriptmanager/scriptmanager_p.h
index 40768f0fa9b..e05778a832d 100644
--- a/src/plugins/coreplugin/scriptmanager/scriptmanager_p.h
+++ b/src/plugins/coreplugin/scriptmanager/scriptmanager_p.h
@@ -35,13 +35,15 @@
#define SCRIPTMANAGER_P_H
#include <coreplugin/scriptmanager/scriptmanager.h>
-#include <coreplugin/icore.h>
#include <QtCore/QObject>
#include <QtCore/QList>
#include <QtScript/QScriptEngine>
namespace Core {
+
+class ICore;
+
namespace Internal {
class ScriptManagerPrivate : public Core::ScriptManager
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 87d229d6f4e..b370faea1bb 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -440,9 +440,9 @@ void CPPEditor::switchDeclarationDefinition()
return;
Function *f = lastSymbol->asFunction();
- if (! f) {
+ if (!f) {
Scope *fs = lastSymbol->scope();
- if (! fs->isFunctionScope())
+ if (!fs->isFunctionScope())
fs = fs->enclosingFunctionScope();
if (fs)
f = fs->owner()->asFunction();
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index da8374091d5..58de33f2753 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -40,6 +40,7 @@
#include "workbenchintegration.h"
#include <coreplugin/coreconstants.h>
+#include <coreplugin/icore.h>
#include <coreplugin/uniqueidmanager.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/editormanager/editormanager.h>
diff --git a/src/plugins/designer/settingspage.h b/src/plugins/designer/settingspage.h
index 8ad707dd769..bba91cd5de6 100644
--- a/src/plugins/designer/settingspage.h
+++ b/src/plugins/designer/settingspage.h
@@ -34,7 +34,6 @@
#ifndef DESIGNER_SETTINGSPAGE_H
#define DESIGNER_SETTINGSPAGE_H
-#include <coreplugin/icore.h>
#include <coreplugin/dialogs/ioptionspage.h>
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index a7e7286a30f..d5a1911a334 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -40,6 +40,7 @@
#include "projectexplorer.h"
#include "taskwindow.h"
+#include <coreplugin/icore.h>
#include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/progressmanager/futureprogress.h>
#include <extensionsystem/pluginmanager.h>
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 69b642bc425..a9d4e2fc208 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -62,9 +62,10 @@
#include <coreplugin/basemode.h>
#include <coreplugin/coreconstants.h>
+#include <coreplugin/filemanager.h>
+#include <coreplugin/icore.h>
#include <coreplugin/mainwindow.h>
#include <coreplugin/mimedatabase.h>
-#include <coreplugin/filemanager.h>
#include <coreplugin/modemanager.h>
#include <coreplugin/uniqueidmanager.h>
#include <coreplugin/actionmanager/actionmanager.h>
diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp
index 0091c82f2d4..9bc28fda44c 100644
--- a/src/plugins/projectexplorer/taskwindow.cpp
+++ b/src/plugins/projectexplorer/taskwindow.cpp
@@ -37,6 +37,7 @@
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/coreconstants.h>
+#include <coreplugin/icore.h>
#include <coreplugin/uniqueidmanager.h>
#include <extensionsystem/pluginmanager.h>
#include <texteditor/itexteditor.h>
diff --git a/src/plugins/projectexplorer/taskwindow.h b/src/plugins/projectexplorer/taskwindow.h
index 269f6e3ce62..0f2db145e36 100644
--- a/src/plugins/projectexplorer/taskwindow.h
+++ b/src/plugins/projectexplorer/taskwindow.h
@@ -38,7 +38,6 @@
#include <coreplugin/ioutputpane.h>
#include <coreplugin/icontext.h>
-#include <coreplugin/icore.h>
#include <QtGui/QTreeWidget>
#include <QtGui/QStyledItemDelegate>
diff --git a/src/plugins/qt4projectmanager/qt4buildconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4buildconfigwidget.cpp
index 46d5b106f5c..d473e1dc75c 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfigwidget.cpp
@@ -40,6 +40,7 @@
#include "qt4projectmanager.h"
#include "ui_qt4buildconfigwidget.h"
+#include <coreplugin/icore.h>
#include <coreplugin/mainwindow.h>
#include <QtGui/QFileDialog>
diff --git a/src/plugins/quickopen/filesystemfilter.h b/src/plugins/quickopen/filesystemfilter.h
index c935b9fb2c3..ef7aebd41f4 100644
--- a/src/plugins/quickopen/filesystemfilter.h
+++ b/src/plugins/quickopen/filesystemfilter.h
@@ -37,7 +37,6 @@
#include "iquickopenfilter.h"
#include "ui_filesystemfilter.h"
-#include <coreplugin/icore.h>
#include <coreplugin/editormanager/editormanager.h>
#include <QtCore/QString>
diff --git a/src/plugins/quickopen/quickopenplugin.cpp b/src/plugins/quickopen/quickopenplugin.cpp
index 0abebe3a88f..aab8bf739be 100644
--- a/src/plugins/quickopen/quickopenplugin.cpp
+++ b/src/plugins/quickopen/quickopenplugin.cpp
@@ -47,9 +47,10 @@
#include <coreplugin/baseview.h>
#include <coreplugin/coreconstants.h>
+#include <coreplugin/icore.h>
#include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/progressmanager/progressmanager.h>
#include <extensionsystem/pluginmanager.h>
#include <qtconcurrent/QtConcurrentTools>
diff --git a/src/plugins/quickopen/settingspage.h b/src/plugins/quickopen/settingspage.h
index ddd1d5e2888..9bd0971a049 100644
--- a/src/plugins/quickopen/settingspage.h
+++ b/src/plugins/quickopen/settingspage.h
@@ -41,7 +41,6 @@
#include <QtCore/QHash>
#include <coreplugin/dialogs/ioptionspage.h>
-#include <coreplugin/icore.h>
QT_BEGIN_NAMESPACE
class QListWidgetItem;
--
GitLab