Clean exported headers of the Core plugin.

Change-Id: I26472d568844d5fee62323e01f5c5c12082d5450
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

src/plugins/analyzerbase/analyzermanager.cpp

@@ -44,6 +44,7 @@
 #include <coreplugin/rightpane.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/editormanager/editormanager.h>
 
 #include <projectexplorer/projectexplorer.h>
@@ -65,6 +66,7 @@
 #include <QVBoxLayout>
 #include <QDockWidget>
 #include <QAction>
+#include <QMenu>
 #include <QToolButton>
 #include <QComboBox>
 #include <QStackedWidget>

src/plugins/analyzerbase/detailederrorview.cpp

@@ -35,10 +35,12 @@
 
 #include <utils/qtcassert.h>
 
+#include <QAction>
 #include <QApplication>
 #include <QClipboard>
 #include <QContextMenuEvent>
 #include <QFontMetrics>
+#include <QMenu>
 #include <QPainter>
 #include <QScrollBar>
 

src/plugins/android/androidmanifestdocument.cpp

@@ -33,6 +33,9 @@
 #include "androidconstants.h"
 
 #include <coreplugin/editormanager/ieditor.h>
+#include <coreplugin/idocument.h>
+
+#include <utils/fileutils.h>
 
 #include <QFileInfo>
 

src/plugins/android/androidmanifesteditor.h

@@ -37,6 +37,8 @@
 #include <coreplugin/editormanager/ieditor.h>
 #include <texteditor/texteditor.h>
 
+#include <QActionGroup>
+
 QT_BEGIN_NAMESPACE
 class QToolBar;
 class QActionGroup;

src/plugins/android/javaeditor.cpp

@@ -34,15 +34,16 @@
 #include "androidconstants.h"
 #include "javacompletionassistprovider.h"
 
-#include <texteditor/textdocument.h>
-#include <texteditor/texteditor.h>
-#include <utils/uncommentselection.h>
 #include <coreplugin/editormanager/ieditorfactory.h>
-
+#include <texteditor/normalindenter.h>
+#include <texteditor/textdocument.h>
 #include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorconstants.h>
-#include <texteditor/normalindenter.h>
+#include <texteditor/texteditor.h>
+
 #include <extensionsystem/pluginmanager.h>
+#include <utils/fileutils.h>
+#include <utils/uncommentselection.h>
 
 #include <QFileInfo>
 

src/plugins/bazaar/bazaarplugin.cpp

@@ -48,6 +48,7 @@
 #include <coreplugin/id.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/documentmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/locator/commandlocator.h>

src/plugins/beautifier/beautifierplugin.cpp

@@ -57,6 +57,7 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QFutureWatcher>
+#include <QMenu>
 #include <QPlainTextEdit>
 #include <QProcess>
 #include <QScrollBar>

src/plugins/bookmarks/bookmarkmanager.cpp

@@ -36,6 +36,7 @@
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
 #include <projectexplorer/projectexplorer.h>

src/plugins/classview/classviewmanager.cpp

@@ -42,6 +42,7 @@
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
+#include <coreplugin/idocument.h>
 #include <texteditor/texteditor.h>
 
 #include <QThread>

src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp

@@ -34,15 +34,17 @@
 #include "cmakeproject.h"
 #include "cmakesettingspage.h"
 
-#include <utils/synchronousprocess.h>
-
 #include <coreplugin/icore.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
-#include <projectexplorer/projecttree.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/projecttree.h>
+
+#include <utils/synchronousprocess.h>
+
+#include <QAction>
 #include <QDateTime>
 
 using namespace CMakeProjectManager::Internal;

src/plugins/coreplugin/actionmanager/actioncontainer.cpp

@@ -32,6 +32,7 @@
 #include "actionmanager.h"
 
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/icontext.h>
 #include <coreplugin/id.h>
 
 #include <utils/hostosinfo.h>

src/plugins/coreplugin/actionmanager/actionmanager.h

@@ -48,6 +48,8 @@ QT_END_NAMESPACE
 namespace Core {
 
 class ActionContainer;
+class Command;
+class Context;
 
 namespace Internal {
 class CorePlugin;

src/plugins/coreplugin/actionmanager/commandbutton.cpp

@@ -29,8 +29,10 @@
 ****************************************************************************/
 
 #include "commandbutton.h"
+#include "actionmanager.h"
+#include "command.h"
+#include "../id.h"
 
-#include <coreplugin/actionmanager/actionmanager.h>
 #include <utils/proxyaction.h>
 
 using namespace Core;

src/plugins/coreplugin/actionmanager/commandmappings.h

@@ -33,8 +33,6 @@
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
-#include <QObject>
-
 QT_BEGIN_NAMESPACE
 class QLineEdit;
 class QTreeWidget;

src/plugins/coreplugin/basefilewizardfactory.h

@@ -33,14 +33,11 @@
 
 #include "core_global.h"
 #include "generatedfile.h"
-#include "featureprovider.h"
 
 #include <coreplugin/iwizardfactory.h>
 
-#include <extensionsystem/iplugin.h>
-
-#include <QSharedDataPointer>
 #include <QList>
+#include <QVariantMap>
 
 QT_BEGIN_NAMESPACE
 class QIcon;

src/plugins/coreplugin/coreplugin.cpp

@@ -31,6 +31,7 @@
 #include "coreplugin.h"
 #include "designmode.h"
 #include "editmode.h"
+#include "idocument.h"
 #include "helpmanager.h"
 #include "mainwindow.h"
 #include "modemanager.h"

src/plugins/coreplugin/designmode.cpp

@@ -31,6 +31,7 @@
 #include "designmode.h"
 
 #include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/modemanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/coreconstants.h>

src/plugins/coreplugin/dialogs/ioptionspage.cpp

@@ -35,6 +35,7 @@
 
 #include <QCheckBox>
 #include <QGroupBox>
+#include <QIcon>
 #include <QLabel>
 #include <QPushButton>
 
@@ -80,6 +81,11 @@
     side of the \gui Options dialog.
 */
 
+QIcon Core::IOptionsPage::categoryIcon() const
+{
+    return QIcon(m_categoryIcon);
+}
+
 /*!
     \fn QWidget *IOptionsPage::widget()
 
@@ -183,3 +189,8 @@ bool Core::IOptionsPage::matches(const QString &searchKeyWord) const
             return true;
     return false;
 }
+
+QIcon Core::IOptionsPageProvider::categoryIcon() const
+{
+    return QIcon(m_categoryIcon);
+}

src/plugins/coreplugin/dialogs/ioptionspage.h

@@ -33,10 +33,14 @@
 
 #include <coreplugin/id.h>
 
-#include <QIcon>
 #include <QObject>
 #include <QStringList>
 
+QT_BEGIN_NAMESPACE
+class QIcon;
+class QWidget;
+QT_END_NAMESPACE
+
 namespace Core {
 
 class CORE_EXPORT IOptionsPage : public QObject
@@ -51,7 +55,7 @@ public:
     QString displayName() const { return m_displayName; }
     Id category() const { return m_category; }
     QString displayCategory() const { return m_displayCategory; }
-    QIcon categoryIcon() const { return QIcon(m_categoryIcon); }
+    QIcon categoryIcon() const;
 
     virtual bool matches(const QString &searchKeyWord) const;
     virtual QWidget *widget() = 0;
@@ -92,7 +96,7 @@ public:
 
     Id category() const { return m_category; }
     QString displayCategory() const { return m_displayCategory; }
-    QIcon categoryIcon() const { return QIcon(m_categoryIcon); }
+    QIcon categoryIcon() const;
 
     virtual QList<IOptionsPage *> pages() const = 0;
     virtual bool matches(const QString & /* searchKeyWord*/) const = 0;

src/plugins/coreplugin/dialogs/newdialog.h

@@ -36,6 +36,7 @@
 #include <QDialog>
 #include <QIcon>
 #include <QList>
+#include <QVariantMap>
 
 QT_BEGIN_NAMESPACE
 class QAbstractProxyModel;

src/plugins/coreplugin/dialogs/saveitemsdialog.cpp

@@ -32,6 +32,8 @@
 
 #include <coreplugin/fileiconprovider.h>
 #include <coreplugin/idocument.h>
+
+#include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 
 #include <QDir>

src/plugins/coreplugin/editormanager/documentmodel.cpp

@@ -37,6 +37,7 @@
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
 
+#include <QAbstractItemModel>
 #include <QDir>
 #include <QIcon>
 #include <QMimeData>

src/plugins/coreplugin/editormanager/documentmodel.h

@@ -36,9 +36,10 @@
 
 #include <utils/fileutils.h>
 
-#include <QAbstractItemModel>
+QT_BEGIN_NAMESPACE
-
+class QAbstractItemModel;
-QT_FORWARD_DECLARE_CLASS(QIcon)
+class QIcon;
+QT_END_NAMESPACE
 
 namespace Core {
 

src/plugins/coreplugin/editormanager/editorarea.cpp

@@ -35,6 +35,7 @@
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icontext.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
 

src/plugins/coreplugin/editormanager/editormanager.cpp

@@ -40,6 +40,7 @@
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/dialogs/openwithdialog.h>
 #include <coreplugin/dialogs/readonlyfilesdialog.h>
@@ -68,6 +69,7 @@
 #include <utils/hostosinfo.h>
 #include <utils/macroexpander.h>
 #include <utils/mimetypes/mimedatabase.h>
+#include <utils/mimetypes/mimetype.h>
 #include <utils/qtcassert.h>
 
 #include <QClipboard>

src/plugins/coreplugin/editormanager/editormanager.h

@@ -35,18 +35,14 @@
 
 #include "documentmodel.h"
 
-#include <coreplugin/id.h>
-#include <coreplugin/idocument.h> // enumerations
-#include <utils/mimetypes/mimetype.h>
-
 #include <QList>
 #include <QWidget>
-#include <QMenu>
 
 #include <functional>
 
-QT_BEGIN_NAMESPACE
+QT_FORWARD_DECLARE_CLASS(QMenu)
-QT_END_NAMESPACE
+
+namespace Utils { class MimeType; }
 
 namespace Core {
 

src/plugins/coreplugin/editormanager/editorview.cpp

@@ -50,6 +50,7 @@
 
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QMenu>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QStackedWidget>

src/plugins/coreplugin/editormanager/ieditorfactory.h

@@ -31,7 +31,11 @@
 #ifndef IEDITORFACTORY_H
 #define IEDITORFACTORY_H
 
-#include <coreplugin/idocumentfactory.h>
+#include <coreplugin/core_global.h>
+#include <coreplugin/id.h>
+
+#include <QObject>
+#include <QStringList>
 
 namespace Core {
 

src/plugins/coreplugin/editormanager/openeditorsview.cpp

@@ -35,6 +35,7 @@
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/actionmanager/command.h>
 
 #include <QApplication>
 #include <QMenu>

src/plugins/coreplugin/editortoolbar.cpp

@@ -31,6 +31,7 @@
 #include "editortoolbar.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/documentmodel.h>
 #include <coreplugin/editormanager/editormanager.h>

src/plugins/coreplugin/editortoolbar.h

@@ -35,8 +35,6 @@
 
 #include <utils/styledbar.h>
 
-#include <QIcon>
-
 #include <functional>
 
 QT_BEGIN_NAMESPACE

src/plugins/coreplugin/externaltool.cpp

@@ -31,6 +31,7 @@
 #include "externaltool.h"
 #include "externaltoolmanager.h"
 
+#include "idocument.h"
 #include "messagemanager.h"
 #include "documentmanager.h"
 #include "editormanager/editormanager.h"

src/plugins/coreplugin/externaltoolmanager.cpp

@@ -31,10 +31,12 @@
 #include "externaltoolmanager.h"
 #include "externaltool.h"
 #include "coreconstants.h"
+#include "icontext.h"
 #include "icore.h"
 #include "messagemanager.h"
 #include "actionmanager/actionmanager.h"
 #include "actionmanager/actioncontainer.h"
+#include "actionmanager/command.h"
 
 #include <utils/qtcassert.h>
 

src/plugins/coreplugin/featureprovider.h

@@ -35,7 +35,6 @@
 
 #include <coreplugin/id.h>
 
-#include <QObject>
 #include <QSet>
 #include <QStringList>
 

src/plugins/coreplugin/find/findplugin.cpp

@@ -34,10 +34,13 @@
 #include "findtoolbar.h"
 #include "findtoolwindow.h"
 #include "searchresultwindow.h"
+#include "icontext.h"
 #include "ifindfilter.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/command.h>
+
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/id.h>

src/plugins/coreplugin/find/findtoolbar.cpp

@@ -29,6 +29,7 @@
 ****************************************************************************/
 
 #include "findtoolbar.h"
+#include "icontext.h"
 #include "ifindfilter.h"
 #include "findplugin.h"
 
@@ -37,6 +38,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/findplaceholder.h>
 
 #include <extensionsystem/pluginmanager.h>

src/plugins/coreplugin/find/searchresultwindow.cpp

@@ -34,6 +34,7 @@
 
 #include <coreplugin/icore.h>
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icontext.h>
 #include <utils/qtcassert.h>

src/plugins/coreplugin/idocument.h

@@ -32,14 +32,13 @@
 #define IDOCUMENT_H
 
 #include "core_global.h"
-#include "id.h"
-
-#include <utils/fileutils.h>
 
 #include <QObject>
 
-namespace Core {
+namespace Utils { class FileName; }
 
+namespace Core {
+class Id;
 class InfoBar;
 
 namespace Internal {

src/plugins/coreplugin/iwizardfactory.h

@@ -32,13 +32,11 @@
 #define IWIZARDFACTORY_H
 
 #include <coreplugin/core_global.h>
-#include <coreplugin/id.h>
 #include <coreplugin/featureprovider.h>
 
 #include <QIcon>
 #include <QObject>
 #include <QString>
-#include <QVariantMap>
 
 namespace Core {
 

src/plugins/coreplugin/jsexpander.h

@@ -33,10 +33,10 @@
 
 #include "core_global.h"
 
-#include <functional>
+QT_BEGIN_NAMESPACE
-
+class QObject;
-#include <QFileInfo>
+class QString;
-#include <QString>
+QT_END_NAMESPACE
 
 namespace Core {
 

src/plugins/coreplugin/locator/filesystemfilter.cpp

@@ -32,6 +32,7 @@
 #include "locatorwidget.h"
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/idocument.h>
 #include <utils/fileutils.h>
 
 #include <QDir>

src/plugins/coreplugin/locator/opendocumentsfilter.cpp

@@ -34,6 +34,7 @@
 #include <coreplugin/editormanager/ieditor.h>
 #include <utils/fileutils.h>
 
+#include <QAbstractItemModel>
 #include <QFileInfo>
 #include <QMutexLocker>
 

src/plugins/coreplugin/modemanager.cpp

@@ -36,6 +36,7 @@
 #include "mainwindow.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/imode.h>
 

src/plugins/coreplugin/modemanager.h

@@ -32,7 +32,6 @@
 #define MODEMANAGER_H
 
 #include <coreplugin/core_global.h>
-#include <coreplugin/id.h>
 #include <QObject>
 
 QT_BEGIN_NAMESPACE
@@ -41,6 +40,7 @@ QT_END_NAMESPACE
 
 namespace Core {
 
+class Id;
 class IMode;
 
 namespace Internal {

src/plugins/coreplugin/outputpanemanager.cpp

@@ -39,6 +39,7 @@
 
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 

src/plugins/coreplugin/progressmanager/futureprogress.cpp

@@ -29,6 +29,7 @@
 ****************************************************************************/
 
 #include "futureprogress.h"
+#include "id.h"
 #include "progressbar.h"
 
 #include <utils/stylehelper.h>

src/plugins/coreplugin/progressmanager/futureprogress.h

@@ -32,13 +32,13 @@
 #define FUTUREPROGRESS_H
 
 #include <coreplugin/core_global.h>
-#include <coreplugin/id.h>
 
 #include <QString>
 #include <QFuture>
 #include <QWidget>
 
 namespace Core {
+class Id;
 class FutureProgressPrivate;
 
 class CORE_EXPORT FutureProgress : public QWidget

src/plugins/coreplugin/progressmanager/progressmanager.cpp

@@ -33,6 +33,7 @@
 #include "progressbar.h"
 #include "progressview.h"
 #include "../actionmanager/actionmanager.h"
+#include "../actionmanager/command.h"
 #include "../icontext.h"
 #include "../coreconstants.h"
 #include "../icore.h"

src/plugins/coreplugin/variablechooser.h

@@ -38,8 +38,6 @@
 #include <utils/macroexpander.h>
 #include <functional>
 
-namespace Utils { class MacroExpander; }
-
 namespace Core {
 
 namespace Internal { class VariableChooserPrivate; }

src/plugins/coreplugin/vcsmanager.h

@@ -32,13 +32,13 @@
 #define VCSMANAGER_H
 
 #include "core_global.h"
-#include "id.h"
 
 #include <QString>
 #include <QObject>
 
 namespace Core {
 
+class Id;
 class IVersionControl;
 
 namespace Internal { class MainWindow; }

src/plugins/coreplugin/windowsupport.cpp

@@ -32,6 +32,7 @@
 
 #include "actionmanager/actioncontainer.h"
 #include "actionmanager/actionmanager.h"
+#include "actionmanager/command.h"
 #include "coreconstants.h"
 #include "icore.h"
 

src/plugins/cpaster/cpasterplugin.cpp

@@ -61,6 +61,7 @@
 #include <QApplication>
 #include <QClipboard>
 #include <QInputDialog>
+#include <QMenu>
 #include <QUrl>
 
 using namespace Core;

src/plugins/cppeditor/cppeditorplugin.cpp

@@ -52,6 +52,7 @@
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/fileiconprovider.h>
 #include <coreplugin/icore.h>

src/plugins/cppeditor/cppfunctiondecldeflink.cpp

@@ -34,6 +34,7 @@
 #include "cppquickfixassistant.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/actionmanager/command.h>
 #include <cpptools/cppcodestylesettings.h>
 #include <cpptools/cpplocalsymbols.h>
 #include <cpptools/symbolfinder.h>

src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp

@@ -42,6 +42,7 @@
 #include <texteditor/codeassist/iassistproposal.h>
 
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/idocument.h>
 
 #include <utils/fileutils.h>
 

src/plugins/cpptools/cppcurrentdocumentfilter.cpp

@@ -33,6 +33,7 @@
 #include "cppmodelmanager.h"
 
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/idocument.h>
 
 #include <QStringMatcher>
 

src/plugins/cpptools/cpptoolsplugin.cpp

@@ -52,6 +52,7 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/documentmanager.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/jsexpander.h>
 #include <coreplugin/vcsmanager.h>
 #include <cppeditor/cppeditorconstants.h>

src/plugins/cpptools/cpptoolsreuse.cpp

@@ -31,6 +31,7 @@
 #include "cpptoolsreuse.h"
 
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/idocument.h>
 #include <texteditor/convenience.h>
 
 #include <cplusplus/Overview.h>

src/plugins/debugger/debuggerengine.cpp

@@ -53,6 +53,7 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/messagebox.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/progressmanager/futureprogress.h>

src/plugins/debugger/debuggermainwindow.cpp

@@ -39,6 +39,7 @@
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/imode.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
@@ -55,9 +56,11 @@
 
 #include <QDebug>
 
+#include <QAction>
 #include <QDockWidget>
-#include <QVBoxLayout>
+#include <QMenu>
 #include <QToolButton>
+#include <QVBoxLayout>
 
 using namespace Core;
 using namespace ProjectExplorer;

src/plugins/debugger/debuggerplugin.cpp

@@ -74,6 +74,7 @@
 
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/find/itemviewfind.h>
 #include <coreplugin/imode.h>
 #include <coreplugin/coreconstants.h>

src/plugins/debugger/imageviewer.cpp

@@ -33,8 +33,11 @@
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
+#include <coreplugin/idocument.h>
 
+#include <QAction>
 #include <QLabel>
+#include <QMenu>
 #include <QImage>
 #include <QVBoxLayout>
 #include <QMouseEvent>

src/plugins/debugger/memoryagent.cpp

@@ -40,6 +40,7 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/messagebox.h>
 
 #include <utils/qtcassert.h>

src/plugins/designer/formeditorplugin.cpp

@@ -43,18 +43,22 @@
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/designmode.h>
 #include <cpptools/cpptoolsconstants.h>
 #include <projectexplorer/jsonwizard/jsonwizardfactory.h>
 #include <utils/mimetypes/mimedatabase.h>
-#
+
+#include <QAction>
 #include <QApplication>
 #include <QDebug>
 #include <QFileInfo>
 #include <QLibraryInfo>
+#include <QMenu>
 #include <QTranslator>
 #include <QtPlugin>
 

src/plugins/designer/formeditorw.cpp

@@ -68,6 +68,7 @@
 #include <QApplication>
 #include <QCursor>
 #include <QDockWidget>
+#include <QMenu>
 #include <QMessageBox>
 #include <QKeySequence>
 #include <QPrintDialog>

src/plugins/designer/formwindoweditor.cpp

@@ -36,6 +36,7 @@
 #include <coreplugin/coreconstants.h>
 #include <texteditor/textdocument.h>
 
+#include <utils/fileutils.h>
 #include <utils/qtcassert.h>
 
 #include <QBuffer>

src/plugins/designer/formwindowfile.cpp

@@ -32,6 +32,7 @@
 #include "designerconstants.h"
 #include "resourcehandler.h"
 
+#include <utils/fileutils.h>
 #include <utils/qtcassert.h>
 
 #include <QApplication>

src/plugins/diffeditor/diffeditor.cpp

@@ -47,6 +47,7 @@
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
 
+#include <QAction>
 #include <QStackedWidget>
 #include <QToolButton>
 #include <QSpinBox>

src/plugins/diffeditor/diffeditorplugin.cpp

@@ -37,6 +37,7 @@
 #include "diffeditorreloader.h"
 #include "differ.h"
 
+#include <QAction>
 #include <QFileDialog>
 #include <QTextCodec>
 #include <QtPlugin>

src/plugins/genericprojectmanager/genericprojectplugin.cpp

@@ -41,6 +41,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/command.h>
 
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projecttree.h>

src/plugins/git/gitclient.cpp

@@ -75,6 +75,8 @@
 #include <QSignalMapper>
 #include <QTemporaryFile>
 
+#include <QAction>
+#include <QMenu>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QToolButton>

src/plugins/git/gitplugin.cpp

@@ -55,6 +55,7 @@
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/id.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/infobar.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
@@ -82,6 +83,7 @@
 
 #include <QAction>
 #include <QFileDialog>
+#include <QMenu>
 #include <QScopedPointer>
 
 #ifdef WITH_TESTS

src/plugins/help/helpwidget.cpp

@@ -43,6 +43,7 @@
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/findplaceholder.h>

src/plugins/imageviewer/imageviewer.cpp

@@ -39,6 +39,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
+#include <utils/fileutils.h>
 #include <utils/qtcassert.h>
 
 #include <QMap>

src/plugins/imageviewer/imageviewerfile.cpp

@@ -33,6 +33,8 @@
 #include "imageviewer.h"
 #include "imageviewerconstants.h"
 
+#include <utils/fileutils.h>
+
 #include <QFileInfo>
 
 namespace ImageViewer {

src/plugins/macros/texteditormacrohandler.cpp

@@ -42,6 +42,7 @@
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/id.h>
 
+#include <QAction>
 #include <QKeyEvent>
 #include <QApplication>
 

src/plugins/mercurial/mercurialplugin.cpp

@@ -47,6 +47,7 @@
 #include <coreplugin/vcsmanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/documentmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 

src/plugins/projectexplorer/appoutputpane.cpp

@@ -36,6 +36,7 @@
 #include "windebuginterface.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/outputwindow.h>
 #include <coreplugin/find/basetextfind.h>

src/plugins/projectexplorer/foldernavigationwidget.cpp

@@ -35,6 +35,7 @@
 
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/fileiconprovider.h>
 #include <coreplugin/documentmanager.h>
 #include <coreplugin/editormanager/editormanager.h>

src/plugins/projectexplorer/projectexplorer.cpp

@@ -108,12 +108,14 @@
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/id.h>
 #include <coreplugin/idocumentfactory.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/documentmanager.h>
 #include <coreplugin/imode.h>
 #include <coreplugin/modemanager.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/infobar.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/findplaceholder.h>

src/plugins/projectexplorer/projecttree.cpp

@@ -39,6 +39,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/infobar.h>
 #include <coreplugin/vcsmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
@@ -46,6 +47,7 @@
 #include <coreplugin/documentmanager.h>
 
 #include <QApplication>
+#include <QMenu>
 #include <QTimer>
 
 namespace {

src/plugins/projectexplorer/projecttreewidget.cpp

@@ -41,6 +41,7 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/documentmanager.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/find/itemviewfind.h>

src/plugins/projectexplorer/session.cpp

@@ -37,6 +37,7 @@
 #include "projectnodes.h"
 
 #include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/imode.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/coreconstants.h>

src/plugins/projectexplorer/taskwindow.cpp

@@ -37,6 +37,7 @@
 #include "taskmodel.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/icontext.h>

src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp

@@ -49,6 +49,7 @@
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/featureprovider.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/fileiconprovider.h>
 #include <projectexplorer/buildmanager.h>
 #include <projectexplorer/project.h>

src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp

@@ -58,6 +58,7 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <texteditor/texteditoractionhandler.h>

src/plugins/qmldesigner/components/componentcore/crumblebar.cpp

@@ -35,6 +35,7 @@
 #include <nodeabstractproperty.h>
 
 #include <coreplugin/documentmanager.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/imode.h>
 #include <coreplugin/editormanager/editormanager.h>
 

src/plugins/qmldesigner/designmodewidget.cpp

@@ -45,6 +45,7 @@
 #include <coreplugin/sidebar.h>
 #include <coreplugin/editortoolbar.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/inavigationwidgetfactory.h>
 #include <extensionsystem/pluginmanager.h>
 

src/plugins/qmldesigner/qmldesignerplugin.cpp

@@ -40,6 +40,7 @@
 #include <qmljstools/qmljstoolsconstants.h>
 
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/designmode.h>
 #include <coreplugin/icore.h>

src/plugins/qmldesigner/shortcutmanager.cpp

@@ -32,7 +32,9 @@
 
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/editormanager/documentmodel.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/coreconstants.h>

src/plugins/qmljstools/qmlconsoleview.cpp

@@ -36,6 +36,8 @@
 #include <coreplugin/manhattanstyle.h>
 #include <utils/hostosinfo.h>
 
+#include <QAction>
+#include <QMenu>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QApplication>

src/plugins/qmljstools/qmljstoolsplugin.cpp

@@ -38,6 +38,7 @@
 #include "qmlconsolemanager.h"
 #include "qmljsbundleprovider.h"
 
+#include <coreplugin/icontext.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/actionmanager/actionmanager.h>

src/plugins/qmlprojectmanager/qmlapp.cpp

@@ -35,6 +35,7 @@
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
 
+#include <QDebug>
 #include <QDir>
 #include <QTextStream>
 

src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

@@ -36,6 +36,7 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
 #include <projectexplorer/target.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtoutputformatter.h>

src/plugins/qnx/qnxplugin.cpp

@@ -66,6 +66,7 @@
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/icontext.h>
 #include <coreplugin/icore.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/projectexplorer.h>

src/plugins/qtsupport/uicodemodelsupport.cpp

@@ -34,6 +34,7 @@
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
+#include <coreplugin/idocument.h>
 #include <cpptools/cppmodelmanager.h>
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildmanager.h>

src/plugins/resourceeditor/resourceeditorplugin.cpp

@@ -41,6 +41,7 @@
 #include <coreplugin/id.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
@@ -58,6 +59,7 @@
 #include <QAction>
 #include <QDebug>
 #include <QInputDialog>
+#include <QMenu>
 #include <QMessageBox>
 #include <QFormLayout>
 #include <QDialogButtonBox>

src/plugins/tasklist/taskfile.cpp

@@ -32,6 +32,8 @@
 
 #include "tasklistplugin.h"
 
+#include <utils/fileutils.h>
+
 using namespace TaskList;
 using namespace TaskList::Internal;
 

src/plugins/texteditor/texteditor.cpp

@@ -71,6 +71,7 @@
 #include <aggregation/aggregate.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/infobar.h>

src/plugins/texteditor/texteditoractionhandler.cpp

@@ -42,6 +42,7 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/command.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>