diff options
Diffstat (limited to 'src/plugins')
103 files changed, 169 insertions, 49 deletions
diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp index 4db3caedee..42bddb4214 100644 --- a/src/plugins/analyzerbase/analyzermanager.cpp +++ b/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> diff --git a/src/plugins/analyzerbase/detailederrorview.cpp b/src/plugins/analyzerbase/detailederrorview.cpp index 73e94b53ee..1c31a7ff40 100644 --- a/src/plugins/analyzerbase/detailederrorview.cpp +++ b/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> diff --git a/src/plugins/android/androidmanifestdocument.cpp b/src/plugins/android/androidmanifestdocument.cpp index cce32f2edf..275e8db74c 100644 --- a/src/plugins/android/androidmanifestdocument.cpp +++ b/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> diff --git a/src/plugins/android/androidmanifesteditor.h b/src/plugins/android/androidmanifesteditor.h index 848a092c62..c8aade5314 100644 --- a/src/plugins/android/androidmanifesteditor.h +++ b/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; diff --git a/src/plugins/android/javaeditor.cpp b/src/plugins/android/javaeditor.cpp index b190c338c5..ec3c026a09 100644 --- a/src/plugins/android/javaeditor.cpp +++ b/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> diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index 9729f00d97..1bc842a1cc 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/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> diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp index bc10838bfd..67bafd1a13 100644 --- a/src/plugins/beautifier/beautifierplugin.cpp +++ b/src/plugins/beautifier/beautifierplugin.cpp @@ -57,6 +57,7 @@ #include <QDir> #include <QFileInfo> #include <QFutureWatcher> +#include <QMenu> #include <QPlainTextEdit> #include <QProcess> #include <QScrollBar> diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index fbca8c0a72..17936c7f10 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/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> diff --git a/src/plugins/classview/classviewmanager.cpp b/src/plugins/classview/classviewmanager.cpp index caf39ef7ff..ba2db7452b 100644 --- a/src/plugins/classview/classviewmanager.cpp +++ b/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> diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp index 2f5c271499..4749d34f39 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp +++ b/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; diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp index ef618123d6..a1aef0885f 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp +++ b/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> diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.h b/src/plugins/coreplugin/actionmanager/actionmanager.h index 493143cfbb..7e924af38c 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.h +++ b/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; diff --git a/src/plugins/coreplugin/actionmanager/commandbutton.cpp b/src/plugins/coreplugin/actionmanager/commandbutton.cpp index 76e0fd4bf3..0b6c273d4e 100644 --- a/src/plugins/coreplugin/actionmanager/commandbutton.cpp +++ b/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; diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.h b/src/plugins/coreplugin/actionmanager/commandmappings.h index 8fbb395171..00da450901 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.h +++ b/src/plugins/coreplugin/actionmanager/commandmappings.h @@ -33,8 +33,6 @@ #include <coreplugin/dialogs/ioptionspage.h> -#include <QObject> - QT_BEGIN_NAMESPACE class QLineEdit; class QTreeWidget; diff --git a/src/plugins/coreplugin/basefilewizardfactory.h b/src/plugins/coreplugin/basefilewizardfactory.h index 44f3d64248..e402852261 100644 --- a/src/plugins/coreplugin/basefilewizardfactory.h +++ b/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; diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp index 923bd2cdcb..4246dfe729 100644 --- a/src/plugins/coreplugin/coreplugin.cpp +++ b/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" diff --git a/src/plugins/coreplugin/designmode.cpp b/src/plugins/coreplugin/designmode.cpp index fe5dd3556f..f119a29eba 100644 --- a/src/plugins/coreplugin/designmode.cpp +++ b/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> diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.cpp b/src/plugins/coreplugin/dialogs/ioptionspage.cpp index f25a8169ab..9b6bdd2ba8 100644 --- a/src/plugins/coreplugin/dialogs/ioptionspage.cpp +++ b/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); +} diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.h b/src/plugins/coreplugin/dialogs/ioptionspage.h index 247437fbb5..4d0a35af42 100644 --- a/src/plugins/coreplugin/dialogs/ioptionspage.h +++ b/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; diff --git a/src/plugins/coreplugin/dialogs/newdialog.h b/src/plugins/coreplugin/dialogs/newdialog.h index 3ce9c6158c..bf1b0d6da3 100644 --- a/src/plugins/coreplugin/dialogs/newdialog.h +++ b/src/plugins/coreplugin/dialogs/newdialog.h @@ -36,6 +36,7 @@ #include <QDialog> #include <QIcon> #include <QList> +#include <QVariantMap> QT_BEGIN_NAMESPACE class QAbstractProxyModel; diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp index 52f1f631e4..89b59da6d9 100644 --- a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp +++ b/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> diff --git a/src/plugins/coreplugin/editormanager/documentmodel.cpp b/src/plugins/coreplugin/editormanager/documentmodel.cpp index aa4b7b0401..79652c1d38 100644 --- a/src/plugins/coreplugin/editormanager/documentmodel.cpp +++ b/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> diff --git a/src/plugins/coreplugin/editormanager/documentmodel.h b/src/plugins/coreplugin/editormanager/documentmodel.h index daf2996755..28d1f9348e 100644 --- a/src/plugins/coreplugin/editormanager/documentmodel.h +++ b/src/plugins/coreplugin/editormanager/documentmodel.h @@ -36,9 +36,10 @@ #include <utils/fileutils.h> -#include <QAbstractItemModel> - -QT_FORWARD_DECLARE_CLASS(QIcon) +QT_BEGIN_NAMESPACE +class QAbstractItemModel; +class QIcon; +QT_END_NAMESPACE namespace Core { diff --git a/src/plugins/coreplugin/editormanager/editorarea.cpp b/src/plugins/coreplugin/editormanager/editorarea.cpp index ef5d1662b0..d1227e5f5e 100644 --- a/src/plugins/coreplugin/editormanager/editorarea.cpp +++ b/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> diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index e7ff06cff0..82a156ab42 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/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> diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h index f2b123c3ba..dc94580250 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.h +++ b/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_END_NAMESPACE +QT_FORWARD_DECLARE_CLASS(QMenu) + +namespace Utils { class MimeType; } namespace Core { diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp index ae541c885a..85fb0baf32 100644 --- a/src/plugins/coreplugin/editormanager/editorview.cpp +++ b/src/plugins/coreplugin/editormanager/editorview.cpp @@ -50,6 +50,7 @@ #include <QHBoxLayout> #include <QLabel> +#include <QMenu> #include <QMouseEvent> #include <QPainter> #include <QStackedWidget> diff --git a/src/plugins/coreplugin/editormanager/ieditorfactory.h b/src/plugins/coreplugin/editormanager/ieditorfactory.h index e7e3e69ba0..ec97906744 100644 --- a/src/plugins/coreplugin/editormanager/ieditorfactory.h +++ b/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 { diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp index 263f8ff7da..08ab777006 100644 --- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp +++ b/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> diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp index 50853a460b..f2dc220f9e 100644 --- a/src/plugins/coreplugin/editortoolbar.cpp +++ b/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> diff --git a/src/plugins/coreplugin/editortoolbar.h b/src/plugins/coreplugin/editortoolbar.h index 7d13929607..d2c16cf54e 100644 --- a/src/plugins/coreplugin/editortoolbar.h +++ b/src/plugins/coreplugin/editortoolbar.h @@ -35,8 +35,6 @@ #include <utils/styledbar.h> -#include <QIcon> - #include <functional> QT_BEGIN_NAMESPACE diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp index 66023c5534..f3c0acc235 100644 --- a/src/plugins/coreplugin/externaltool.cpp +++ b/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" diff --git a/src/plugins/coreplugin/externaltoolmanager.cpp b/src/plugins/coreplugin/externaltoolmanager.cpp index 72efa03bb2..a95f93c0b2 100644 --- a/src/plugins/coreplugin/externaltoolmanager.cpp +++ b/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> diff --git a/src/plugins/coreplugin/featureprovider.h b/src/plugins/coreplugin/featureprovider.h index 32b3439cde..8155653fa1 100644 --- a/src/plugins/coreplugin/featureprovider.h +++ b/src/plugins/coreplugin/featureprovider.h @@ -35,7 +35,6 @@ #include <coreplugin/id.h> -#include <QObject> #include <QSet> #include <QStringList> diff --git a/src/plugins/coreplugin/find/findplugin.cpp b/src/plugins/coreplugin/find/findplugin.cpp index 36b7dc99f1..f1ca96d63a 100644 --- a/src/plugins/coreplugin/find/findplugin.cpp +++ b/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> diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp index b21d7c0518..11fb61501e 100644 --- a/src/plugins/coreplugin/find/findtoolbar.cpp +++ b/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> diff --git a/src/plugins/coreplugin/find/searchresultwindow.cpp b/src/plugins/coreplugin/find/searchresultwindow.cpp index 1edc96f4a5..8233dd4388 100644 --- a/src/plugins/coreplugin/find/searchresultwindow.cpp +++ b/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> diff --git a/src/plugins/coreplugin/idocument.h b/src/plugins/coreplugin/idocument.h index 450a9bed17..d65f43fd3a 100644 --- a/src/plugins/coreplugin/idocument.h +++ b/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 { diff --git a/src/plugins/coreplugin/iwizardfactory.h b/src/plugins/coreplugin/iwizardfactory.h index 4c0d6b32a9..e18714e2cf 100644 --- a/src/plugins/coreplugin/iwizardfactory.h +++ b/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 { diff --git a/src/plugins/coreplugin/jsexpander.h b/src/plugins/coreplugin/jsexpander.h index 6508b26f95..9bf8f99000 100644 --- a/src/plugins/coreplugin/jsexpander.h +++ b/src/plugins/coreplugin/jsexpander.h @@ -33,10 +33,10 @@ #include "core_global.h" -#include <functional> - -#include <QFileInfo> -#include <QString> +QT_BEGIN_NAMESPACE +class QObject; +class QString; +QT_END_NAMESPACE namespace Core { diff --git a/src/plugins/coreplugin/locator/filesystemfilter.cpp b/src/plugins/coreplugin/locator/filesystemfilter.cpp index 211cf535ca..59ee3827aa 100644 --- a/src/plugins/coreplugin/locator/filesystemfilter.cpp +++ b/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> diff --git a/src/plugins/coreplugin/locator/opendocumentsfilter.cpp b/src/plugins/coreplugin/locator/opendocumentsfilter.cpp index 68cd259741..61b9c46117 100644 --- a/src/plugins/coreplugin/locator/opendocumentsfilter.cpp +++ b/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> diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp index 800d125d21..64c107def7 100644 --- a/src/plugins/coreplugin/modemanager.cpp +++ b/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> diff --git a/src/plugins/coreplugin/modemanager.h b/src/plugins/coreplugin/modemanager.h index a219dcfd15..ae74dd4a94 100644 --- a/src/plugins/coreplugin/modemanager.h +++ b/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 { diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp index 14865ff866..e77fa29dd8 100644 --- a/src/plugins/coreplugin/outputpanemanager.cpp +++ b/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> diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.cpp b/src/plugins/coreplugin/progressmanager/futureprogress.cpp index e068d0ad2c..837e35d05c 100644 --- a/src/plugins/coreplugin/progressmanager/futureprogress.cpp +++ b/src/plugins/coreplugin/progressmanager/futureprogress.cpp @@ -29,6 +29,7 @@ ****************************************************************************/ #include "futureprogress.h" +#include "id.h" #include "progressbar.h" #include <utils/stylehelper.h> diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.h b/src/plugins/coreplugin/progressmanager/futureprogress.h index 48ead2dfe4..189d4edfa0 100644 --- a/src/plugins/coreplugin/progressmanager/futureprogress.h +++ b/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 diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp index dcfd838bcc..d20b22e4d8 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp +++ b/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" diff --git a/src/plugins/coreplugin/variablechooser.h b/src/plugins/coreplugin/variablechooser.h index 3326ca923e..7266af6365 100644 --- a/src/plugins/coreplugin/variablechooser.h +++ b/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; } diff --git a/src/plugins/coreplugin/vcsmanager.h b/src/plugins/coreplugin/vcsmanager.h index 1cc5350e33..4631ee80ba 100644 --- a/src/plugins/coreplugin/vcsmanager.h +++ b/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; } diff --git a/src/plugins/coreplugin/windowsupport.cpp b/src/plugins/coreplugin/windowsupport.cpp index 742472e8f7..5c46a1fbee 100644 --- a/src/plugins/coreplugin/windowsupport.cpp +++ b/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" diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp index 338cb5dab9..083394205e 100644 --- a/src/plugins/cpaster/cpasterplugin.cpp +++ b/src/plugins/cpaster/cpasterplugin.cpp @@ -61,6 +61,7 @@ #include <QApplication> #include <QClipboard> #include <QInputDialog> +#include <QMenu> #include <QUrl> using namespace Core; diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp index 377d585703..c8afea541a 100644 --- a/src/plugins/cppeditor/cppeditorplugin.cpp +++ b/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> diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp index 46bf00bc83..80625bdf81 100644 --- a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp +++ b/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> diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp index 2de53e8e62..6fad7736c8 100644 --- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp +++ b/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> diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp index a068820e1c..e4fb68f6db 100644 --- a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp +++ b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp @@ -33,6 +33,7 @@ #include "cppmodelmanager.h" #include <coreplugin/editormanager/editormanager.h> +#include <coreplugin/idocument.h> #include <QStringMatcher> diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index 2a352a6b7d..5f1339c2ef 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/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> diff --git a/src/plugins/cpptools/cpptoolsreuse.cpp b/src/plugins/cpptools/cpptoolsreuse.cpp index d0dd2838e3..77d2ade298 100644 --- a/src/plugins/cpptools/cpptoolsreuse.cpp +++ b/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> diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 70f752d52a..ee52c75300 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/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> diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp index 87075340d7..4458309616 100644 --- a/src/plugins/debugger/debuggermainwindow.cpp +++ b/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; diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 5d6587f6ef..d63ce13af0 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/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> diff --git a/src/plugins/debugger/imageviewer.cpp b/src/plugins/debugger/imageviewer.cpp index 26015f9fc6..898ef7069a 100644 --- a/src/plugins/debugger/imageviewer.cpp +++ b/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> diff --git a/src/plugins/debugger/memoryagent.cpp b/src/plugins/debugger/memoryagent.cpp index 18835e2363..5dbef0020f 100644 --- a/src/plugins/debugger/memoryagent.cpp +++ b/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> diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp index 36322b33f6..daeff86169 100644 --- a/src/plugins/designer/formeditorplugin.cpp +++ b/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> diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp index bc6ddba9f7..c46de4b52f 100644 --- a/src/plugins/designer/formeditorw.cpp +++ b/src/plugins/designer/formeditorw.cpp @@ -68,6 +68,7 @@ #include <QApplication> #include <QCursor> #include <QDockWidget> +#include <QMenu> #include <QMessageBox> #include <QKeySequence> #include <QPrintDialog> diff --git a/src/plugins/designer/formwindoweditor.cpp b/src/plugins/designer/formwindoweditor.cpp index 7dfdaa4396..4bf4ddea84 100644 --- a/src/plugins/designer/formwindoweditor.cpp +++ b/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> diff --git a/src/plugins/designer/formwindowfile.cpp b/src/plugins/designer/formwindowfile.cpp index 082c3f6462..cb6d053774 100644 --- a/src/plugins/designer/formwindowfile.cpp +++ b/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> diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp index 6058e119f9..1b63b8f5a6 100644 --- a/src/plugins/diffeditor/diffeditor.cpp +++ b/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> diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp index 984931dea0..4a980d9921 100644 --- a/src/plugins/diffeditor/diffeditorplugin.cpp +++ b/src/plugins/diffeditor/diffeditorplugin.cpp @@ -37,6 +37,7 @@ #include "diffeditorreloader.h" #include "differ.h" +#include <QAction> #include <QFileDialog> #include <QTextCodec> #include <QtPlugin> diff --git a/src/plugins/genericprojectmanager/genericprojectplugin.cpp b/src/plugins/genericprojectmanager/genericprojectplugin.cpp index 79aa8abcd2..2b784b2434 100644 --- a/src/plugins/genericprojectmanager/genericprojectplugin.cpp +++ b/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> diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 5449567059..42767f0d25 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -75,6 +75,8 @@ #include <QSignalMapper> #include <QTemporaryFile> +#include <QAction> +#include <QMenu> #include <QMessageBox> #include <QPushButton> #include <QToolButton> diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 4c9f1b9dbd..f49ef9b6a9 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/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 diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp index ed4a566e8e..98ca352d44 100644 --- a/src/plugins/help/helpwidget.cpp +++ b/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> diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp index 2520d59e11..fd03c866a2 100644 --- a/src/plugins/imageviewer/imageviewer.cpp +++ b/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> diff --git a/src/plugins/imageviewer/imageviewerfile.cpp b/src/plugins/imageviewer/imageviewerfile.cpp index 3216178bf9..5e55f1b440 100644 --- a/src/plugins/imageviewer/imageviewerfile.cpp +++ b/src/plugins/imageviewer/imageviewerfile.cpp @@ -33,6 +33,8 @@ #include "imageviewer.h" #include "imageviewerconstants.h" +#include <utils/fileutils.h> + #include <QFileInfo> namespace ImageViewer { diff --git a/src/plugins/macros/texteditormacrohandler.cpp b/src/plugins/macros/texteditormacrohandler.cpp index a05ff0a00d..6b42e0f777 100644 --- a/src/plugins/macros/texteditormacrohandler.cpp +++ b/src/plugins/macros/texteditormacrohandler.cpp @@ -42,6 +42,7 @@ #include <coreplugin/actionmanager/command.h> #include <coreplugin/id.h> +#include <QAction> #include <QKeyEvent> #include <QApplication> diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index 13ada03c79..1c077cde2b 100644 --- a/src/plugins/mercurial/mercurialplugin.cpp +++ b/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> diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index 8af58af9a3..a269723f36 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/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> diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp index d6f3a39ad6..6a51aa6538 100644 --- a/src/plugins/projectexplorer/foldernavigationwidget.cpp +++ b/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> diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 97be5283c6..78ccc8d269 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/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> diff --git a/src/plugins/projectexplorer/projecttree.cpp b/src/plugins/projectexplorer/projecttree.cpp index 3f7e0a1e6f..66173a4856 100644 --- a/src/plugins/projectexplorer/projecttree.cpp +++ b/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 { diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp index 29113512ce..aba3e4c32a 100644 --- a/src/plugins/projectexplorer/projecttreewidget.cpp +++ b/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> diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp index 591fd04e89..716e03bddd 100644 --- a/src/plugins/projectexplorer/session.cpp +++ b/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> diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index 173a51bf18..07489dc7b2 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/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> diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp index b9a2f234d0..8c68d5114a 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp +++ b/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> diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp index de5d916813..8a495d4acc 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp +++ b/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> diff --git a/src/plugins/qmldesigner/components/componentcore/crumblebar.cpp b/src/plugins/qmldesigner/components/componentcore/crumblebar.cpp index d4fcfedb99..c66dbd8853 100644 --- a/src/plugins/qmldesigner/components/componentcore/crumblebar.cpp +++ b/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> diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index 3efb840e71..5638c6d19a 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/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> diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index 85c355fc03..11e67f24eb 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/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> diff --git a/src/plugins/qmldesigner/shortcutmanager.cpp b/src/plugins/qmldesigner/shortcutmanager.cpp index 5f8ccfcf8f..dc65e45900 100644 --- a/src/plugins/qmldesigner/shortcutmanager.cpp +++ b/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> diff --git a/src/plugins/qmljstools/qmlconsoleview.cpp b/src/plugins/qmljstools/qmlconsoleview.cpp index 0d97940ed3..ee374f0f00 100644 --- a/src/plugins/qmljstools/qmlconsoleview.cpp +++ b/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> diff --git a/src/plugins/qmljstools/qmljstoolsplugin.cpp b/src/plugins/qmljstools/qmljstoolsplugin.cpp index 43bdbca48d..8c2f637fed 100644 --- a/src/plugins/qmljstools/qmljstoolsplugin.cpp +++ b/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> diff --git a/src/plugins/qmlprojectmanager/qmlapp.cpp b/src/plugins/qmlprojectmanager/qmlapp.cpp index 574677a30f..32015d4a89 100644 --- a/src/plugins/qmlprojectmanager/qmlapp.cpp +++ b/src/plugins/qmlprojectmanager/qmlapp.cpp @@ -35,6 +35,7 @@ #include <utils/fileutils.h> #include <utils/qtcassert.h> +#include <QDebug> #include <QDir> #include <QTextStream> diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index 3da719d53b..a5357373b2 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/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> diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp index 8bf083d2ec..8d499e7f55 100644 --- a/src/plugins/qnx/qnxplugin.cpp +++ b/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> diff --git a/src/plugins/qtsupport/uicodemodelsupport.cpp b/src/plugins/qtsupport/uicodemodelsupport.cpp index 445dc1048d..0fb3f4154b 100644 --- a/src/plugins/qtsupport/uicodemodelsupport.cpp +++ b/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> diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp index df4d22a295..bf2d9f3d40 100644 --- a/src/plugins/resourceeditor/resourceeditorplugin.cpp +++ b/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> diff --git a/src/plugins/tasklist/taskfile.cpp b/src/plugins/tasklist/taskfile.cpp index 1c3c889dba..5e1fcf60fd 100644 --- a/src/plugins/tasklist/taskfile.cpp +++ b/src/plugins/tasklist/taskfile.cpp @@ -32,6 +32,8 @@ #include "tasklistplugin.h" +#include <utils/fileutils.h> + using namespace TaskList; using namespace TaskList::Internal; diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index 342eceb8ed..d52105f69b 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/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> diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp index 06fa947cec..ae481a8b17 100644 --- a/src/plugins/texteditor/texteditoractionhandler.cpp +++ b/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> diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp index 88ac6b4469..1333f77016 100644 --- a/src/plugins/texteditor/texteditorplugin.cpp +++ b/src/plugins/texteditor/texteditorplugin.cpp @@ -46,6 +46,7 @@ #include <coreplugin/icore.h> #include <coreplugin/actionmanager/actionmanager.h> +#include <coreplugin/actionmanager/command.h> #include <coreplugin/externaltoolmanager.h> #include <extensionsystem/pluginmanager.h> diff --git a/src/plugins/todo/todoitemsprovider.cpp b/src/plugins/todo/todoitemsprovider.cpp index a4d531c185..ccad022cfd 100644 --- a/src/plugins/todo/todoitemsprovider.cpp +++ b/src/plugins/todo/todoitemsprovider.cpp @@ -38,6 +38,7 @@ #include <projectexplorer/projectexplorer.h> #include <coreplugin/editormanager/editormanager.h> +#include <coreplugin/idocument.h> #include <projectexplorer/session.h> #include <QTimer> diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index ce0bc1bc1b..366f76d51f 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -39,6 +39,7 @@ #include <coreplugin/documentmanager.h> #include <coreplugin/icore.h> #include <coreplugin/id.h> +#include <coreplugin/idocument.h> #include <coreplugin/iversioncontrol.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/vcsmanager.h> |