diff options
| author | hjk <qtc-committer@nokia.com> | 2009-01-14 15:08:46 +0100 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2009-01-14 15:08:46 +0100 |
| commit | 266ee2a4683c034eef11b6ba26cd06cd4553f5d7 (patch) | |
| tree | bf889fa1da87d92dfa8172c1c116d7857bd12b0e | |
| parent | 48cd14f7b9ec612e05a16a29d6196e54df4948dd (diff) | |
remove ProjectExplorerInterface and ExtensionSystemInterfaces files
33 files changed, 123 insertions, 215 deletions
diff --git a/shared/scriptwrapper/interface_wrap_helpers.h b/shared/scriptwrapper/interface_wrap_helpers.h index 0ead88f90fc..8ec308fe7e1 100644 --- a/shared/scriptwrapper/interface_wrap_helpers.h +++ b/shared/scriptwrapper/interface_wrap_helpers.h @@ -34,7 +34,6 @@ #ifndef INTERFACE_WRAP_HELPERS_H #define INTERFACE_WRAP_HELPERS_H -#include <extensionsystem/ExtensionSystemInterfaces> #include <QtScript/QScriptEngine> namespace SharedTools { diff --git a/src/libs/extensionsystem/ExtensionSystemInterfaces b/src/libs/extensionsystem/ExtensionSystemInterfaces deleted file mode 100644 index 7f42b55e89a..00000000000 --- a/src/libs/extensionsystem/ExtensionSystemInterfaces +++ /dev/null @@ -1,39 +0,0 @@ -/*************************************************************************** -** -** This file is part of Qt Creator -** -** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Qt Software Information (qt-info@nokia.com) -** -** -** Non-Open Source Usage -** -** Licensees may use this file in accordance with the Qt Beta Version -** License Agreement, Agreement version 2.2 provided with the Software or, -** alternatively, in accordance with the terms contained in a written -** agreement between you and Nokia. -** -** GNU General Public License Usage -** -** Alternatively, this file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the packaging -** of this file. Please review the following information to ensure GNU -** General Public Licensing requirements will be met: -** -** http://www.fsf.org/licensing/licenses/info/GPLv2.html and -** http://www.gnu.org/copyleft/gpl.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.3, included in the file GPL_EXCEPTION.txt in this package. -** -***************************************************************************/ - -#include "extensionsystem/pluginmanager.h" -#include "extensionsystem/pluginspec.h" -#include "extensionsystem/iplugin.h" -#include "extensionsystem/pluginview.h" -#include "extensionsystem/pluginerrorview.h" -#include "extensionsystem/plugindetailsview.h" diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index 88857a81fb7..735afc37989 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -37,10 +37,10 @@ #include "bookmarksplugin.h" #include "bookmarks_global.h" -#include <projectexplorer/ProjectExplorerInterfaces> #include <coreplugin/icore.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/uniqueidmanager.h> +#include <projectexplorer/projectexplorer.h> #include <texteditor/basetexteditor.h> #include <utils/qtcassert.h> @@ -49,6 +49,7 @@ #include <QtGui/QAction> #include <QtGui/QContextMenuEvent> +#include <QtGui/QMenu> #include <QtGui/QPainter> Q_DECLARE_METATYPE(Bookmarks::Internal::Bookmark*) diff --git a/src/plugins/coreplugin/baseview.cpp b/src/plugins/coreplugin/baseview.cpp index f3dd93f5155..ae93c281fa5 100644 --- a/src/plugins/coreplugin/baseview.cpp +++ b/src/plugins/coreplugin/baseview.cpp @@ -33,7 +33,7 @@ #include "baseview.h" -#include <extensionsystem/ExtensionSystemInterfaces> +#include <QtGui/QWidget> using namespace Core; diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index 8dd7d9c588d..cdada0a1ccb 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -34,8 +34,6 @@ #ifndef CORECONSTANTS_H #define CORECONSTANTS_H -#include <extensionsystem/ExtensionSystemInterfaces> - namespace Core { namespace Constants { diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp index f6b586f7603..41b5116ba54 100644 --- a/src/plugins/coreplugin/navigationwidget.cpp +++ b/src/plugins/coreplugin/navigationwidget.cpp @@ -39,7 +39,6 @@ #include <coreplugin/modemanager.h> #include <coreplugin/uniqueidmanager.h> #include <coreplugin/actionmanager/actionmanager.h> -#include <extensionsystem/ExtensionSystemInterfaces> #include <QtGui/QAction> #include <QtGui/QHBoxLayout> diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp index 1ac21ca743c..937af4f66a3 100644 --- a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp +++ b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp @@ -35,7 +35,6 @@ #include "qworkbench_wrapper.h" #include "metatypedeclarations.h" -#include <extensionsystem/ExtensionSystemInterfaces> #include <utils/qtcassert.h> #include <interface_wrap_helpers.h> #include <wrap_helpers.h> diff --git a/src/plugins/coreplugin/viewmanager.cpp b/src/plugins/coreplugin/viewmanager.cpp index 0db47634729..a7a2bf9a45e 100644 --- a/src/plugins/coreplugin/viewmanager.cpp +++ b/src/plugins/coreplugin/viewmanager.cpp @@ -40,7 +40,6 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/command.h> -#include <extensionsystem/ExtensionSystemInterfaces> #include <aggregation/aggregate.h> #include <QtCore/QSettings> diff --git a/src/plugins/cpaster/cpasterplugin.h b/src/plugins/cpaster/cpasterplugin.h index b6694be562c..56c41144a96 100644 --- a/src/plugins/cpaster/cpasterplugin.h +++ b/src/plugins/cpaster/cpasterplugin.h @@ -40,8 +40,8 @@ #include <coreplugin/editormanager/ieditorfactory.h> #include <coreplugin/icorelistener.h> -#include <projectexplorer/ProjectExplorerInterfaces> #include <extensionsystem/iplugin.h> +#include <projectexplorer/projectexplorer.h> #include <QtCore/QObject> diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h index a55630e6c04..092de535b3e 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -35,7 +35,7 @@ #define CPPTOOLS_H #include <extensionsystem/iplugin.h> -#include <projectexplorer/ProjectExplorerInterfaces> +#include <projectexplorer/projectexplorer.h> QT_BEGIN_NAMESPACE class QFileInfo; diff --git a/src/plugins/designer/formeditorfactory.h b/src/plugins/designer/formeditorfactory.h index 02ad78fdb2d..5d13e45080a 100644 --- a/src/plugins/designer/formeditorfactory.h +++ b/src/plugins/designer/formeditorfactory.h @@ -34,7 +34,6 @@ #ifndef FORMEDITORFACTORY_H #define FORMEDITORFACTORY_H -#include <extensionsystem/ExtensionSystemInterfaces> #include <coreplugin/editormanager/ieditorfactory.h> #include <QtCore/QStringList> diff --git a/src/plugins/designer/formeditorw.h b/src/plugins/designer/formeditorw.h index 6aaca2c5924..f41d3554e25 100644 --- a/src/plugins/designer/formeditorw.h +++ b/src/plugins/designer/formeditorw.h @@ -34,12 +34,12 @@ #ifndef FORMEDITORW_H #define FORMEDITORW_H -#include <extensionsystem/ExtensionSystemInterfaces> #include <QtDesigner/QDesignerFormEditorInterface> -#include <QtCore/QObject> #include <QtCore/QList> +#include <QtCore/QObject> #include <QtCore/QPointer> +#include <QtCore/QStringList> #include "designerconstants.h" diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h index 22fcea7c011..19c61db291a 100644 --- a/src/plugins/git/gitplugin.h +++ b/src/plugins/git/gitplugin.h @@ -39,8 +39,8 @@ #include <coreplugin/editormanager/ieditorfactory.h> #include <coreplugin/icorelistener.h> -#include <projectexplorer/ProjectExplorerInterfaces> #include <extensionsystem/iplugin.h> +#include <projectexplorer/projectexplorer.h> #include <QtCore/QObject> #include <QtCore/QProcess> @@ -53,20 +53,20 @@ class QTemporaryFile; QT_END_NAMESPACE namespace Core { - class IEditorFactory; - class ICore; - class IVersionControl; -} +class IEditorFactory; +class ICore; +class IVersionControl; +} // namespace Core namespace Git { namespace Internal { - class GitPlugin; - class GitClient; - class ChangeSelectionDialog; - class GitSubmitEditor; - struct CommitData; - struct GitSettings; +class GitPlugin; +class GitClient; +class ChangeSelectionDialog; +class GitSubmitEditor; +struct CommitData; +struct GitSettings; // Just a proxy for GitPlugin class CoreListener : public Core::ICoreListener @@ -85,83 +85,83 @@ class GitPlugin : public ExtensionSystem::IPlugin Q_OBJECT public: - GitPlugin(); - ~GitPlugin(); + GitPlugin(); + ~GitPlugin(); + static GitPlugin *instance(); - bool initialize(const QStringList &arguments - , QString *error_message); - void extensionsInitialized(); + bool initialize(const QStringList &arguments, QString *error_message); + void extensionsInitialized(); - QString getWorkingDirectory(); + QString getWorkingDirectory(); - GitOutputWindow *outputWindow() const; + GitOutputWindow *outputWindow() const; - GitSettings settings() const; + GitSettings settings() const; void setSettings(const GitSettings &s); public slots: - void updateActions(); - bool editorAboutToClose(Core::IEditor *editor); + void updateActions(); + bool editorAboutToClose(Core::IEditor *editor); private slots: - void diffCurrentFile(); - void diffCurrentProject(); - void submitEditorDiff(const QStringList &unstaged, const QStringList &staged); - void submitCurrentLog(); - void statusFile(); - void statusProject(); - void logFile(); - void blameFile(); - void logProject(); - void undoFileChanges(); - void undoProjectChanges(); - void stageFile(); - void unstageFile(); - void revertFile(); - - void showCommit(); - void startCommit(); - void stash(); - void stashPop(); - void branchList(); - void stashList(); - void pull(); - void push(); + void diffCurrentFile(); + void diffCurrentProject(); + void submitEditorDiff(const QStringList &unstaged, const QStringList &staged); + void submitCurrentLog(); + void statusFile(); + void statusProject(); + void logFile(); + void blameFile(); + void logProject(); + void undoFileChanges(); + void undoProjectChanges(); + void stageFile(); + void unstageFile(); + void revertFile(); + + void showCommit(); + void startCommit(); + void stash(); + void stashPop(); + void branchList(); + void stashList(); + void pull(); + void push(); private: - QFileInfo currentFile() const; - Core::IEditor *openSubmitEditor(const QString &fileName, const CommitData &cd); - void cleanChangeTmpFile(); - - static GitPlugin *m_instance; - Core::ICore *m_core; - QAction *m_diffAction; - QAction *m_diffProjectAction; - QAction *m_statusAction; - QAction *m_statusProjectAction; - QAction *m_logAction; - QAction *m_blameAction; - QAction *m_logProjectAction; - QAction *m_undoFileAction; - QAction *m_undoProjectAction; - QAction *m_showAction; - QAction *m_stageAction; - QAction *m_unstageAction; - QAction *m_revertAction; - QAction *m_commitAction; - QAction *m_pullAction; - QAction *m_pushAction; - - QAction *m_submitCurrentAction; - QAction *m_diffSelectedFilesAction; - QAction *m_undoAction; - QAction *m_redoAction; - QAction *m_stashAction; - QAction *m_stashPopAction; - QAction *m_stashListAction; - QAction *m_branchListAction; + QFileInfo currentFile() const; + Core::IEditor *openSubmitEditor(const QString &fileName, const CommitData &cd); + void cleanChangeTmpFile(); + + static GitPlugin *m_instance; + Core::ICore *m_core; + QAction *m_diffAction; + QAction *m_diffProjectAction; + QAction *m_statusAction; + QAction *m_statusProjectAction; + QAction *m_logAction; + QAction *m_blameAction; + QAction *m_logProjectAction; + QAction *m_undoFileAction; + QAction *m_undoProjectAction; + QAction *m_showAction; + QAction *m_stageAction; + QAction *m_unstageAction; + QAction *m_revertAction; + QAction *m_commitAction; + QAction *m_pullAction; + QAction *m_pushAction; + + QAction *m_submitCurrentAction; + QAction *m_diffSelectedFilesAction; + QAction *m_undoAction; + QAction *m_redoAction; + QAction *m_stashAction; + QAction *m_stashPopAction; + QAction *m_stashListAction; + QAction *m_branchListAction; ProjectExplorer::ProjectExplorerPlugin *m_projectExplorer; GitClient *m_gitClient; diff --git a/src/plugins/perforce/perforceplugin.h b/src/plugins/perforce/perforceplugin.h index a5e52ba6b03..8069154a25c 100644 --- a/src/plugins/perforce/perforceplugin.h +++ b/src/plugins/perforce/perforceplugin.h @@ -39,8 +39,8 @@ #include <coreplugin/editormanager/ieditorfactory.h> #include <coreplugin/iversioncontrol.h> #include <coreplugin/icorelistener.h> -#include <projectexplorer/ProjectExplorerInterfaces> #include <extensionsystem/iplugin.h> +#include <projectexplorer/projectexplorer.h> #ifdef USE_P4_API #include "workbenchclientuser.h" diff --git a/src/plugins/projectexplorer/ProjectExplorerInterfaces b/src/plugins/projectexplorer/ProjectExplorerInterfaces deleted file mode 100644 index b6eb45c7ac5..00000000000 --- a/src/plugins/projectexplorer/ProjectExplorerInterfaces +++ /dev/null @@ -1,44 +0,0 @@ -/*************************************************************************** -** -** This file is part of Qt Creator -** -** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Qt Software Information (qt-info@nokia.com) -** -** -** Non-Open Source Usage -** -** Licensees may use this file in accordance with the Qt Beta Version -** License Agreement, Agreement version 2.2 provided with the Software or, -** alternatively, in accordance with the terms contained in a written -** agreement between you and Nokia. -** -** GNU General Public License Usage -** -** Alternatively, this file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the packaging -** of this file. Please review the following information to ensure GNU -** General Public Licensing requirements will be met: -** -** http://www.fsf.org/licensing/licenses/info/GPLv2.html and -** http://www.gnu.org/copyleft/gpl.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.3, included in the file GPL_EXCEPTION.txt in this package. -** -***************************************************************************/ - -#include "projectexplorer/buildparserinterface.h" -#include "projectexplorer/projectexplorerconstants.h" -#include "projectexplorer/project.h" -#include "projectexplorer/buildstep.h" -#include "projectexplorer/buildconfiguration.h" -#include "projectexplorer/buildmanager.h" -#include "projectexplorer/projectexplorer.h" -#include "projectexplorer/persistentsettings.h" -#include "projectexplorer/environment.h" -#include "projectexplorer/environmenteditmodel.h" -#include "projectexplorer/abstractprocessstep.h" diff --git a/src/plugins/projectexplorer/applicationlauncher_x11.cpp b/src/plugins/projectexplorer/applicationlauncher_x11.cpp index 9a1c4c3d737..79933d4518b 100644 --- a/src/plugins/projectexplorer/applicationlauncher_x11.cpp +++ b/src/plugins/projectexplorer/applicationlauncher_x11.cpp @@ -34,10 +34,7 @@ #include "applicationlauncher.h" #include "consoleprocess.h" -#include <projectexplorer/ProjectExplorerInterfaces> - #include <QtCore/QTimer> -#include <QtDebug> using namespace ProjectExplorer::Internal; diff --git a/src/plugins/qt4projectmanager/buildparserfactory.h b/src/plugins/qt4projectmanager/buildparserfactory.h index 0e8495d5fb0..a52c33f7193 100644 --- a/src/plugins/qt4projectmanager/buildparserfactory.h +++ b/src/plugins/qt4projectmanager/buildparserfactory.h @@ -34,12 +34,8 @@ #ifndef BUILDPARSERFACTORY_H #define BUILDPARSERFACTORY_H -#include <projectexplorer/ProjectExplorerInterfaces> +#include <projectexplorer/buildparserinterface.h> - -namespace ProjectExplorer { -class BuildParserInterface; -} namespace Qt4ProjectManager { namespace Internal { @@ -66,5 +62,4 @@ public: } // namespace Internal } // namespace Qt4ProjectManager - #endif // BUILDPARSERFACTORY_H diff --git a/src/plugins/qt4projectmanager/cesdkhandler.h b/src/plugins/qt4projectmanager/cesdkhandler.h index dd9c1d9b5e0..d46a65c2ab9 100644 --- a/src/plugins/qt4projectmanager/cesdkhandler.h +++ b/src/plugins/qt4projectmanager/cesdkhandler.h @@ -31,13 +31,13 @@ ** ***************************************************************************/ -#ifndef CE_SDK_HANDLER_INCL -#define CE_SDK_HANDLER_INCL +#ifndef CE_SDK_HANDLER_H +#define CE_SDK_HANDLER_H -#include <projectexplorer/ProjectExplorerInterfaces> +#include <projectexplorer/projectexplorer.h> -#include <QStringList> -#include <QDir> +#include <QtCore/QStringList> +#include <QtCore/QDir> #define VCINSTALL_MACRO "$(VCInstallDir)" #define VSINSTALL_MACRO "$(VSInstallDir)" @@ -105,4 +105,4 @@ inline QString CeSdkHandler::fixPaths(QString path) const } // namespace Internal } // namespace Qt4ProjectManager -#endif // CE_SDK_HANDLER_INCL +#endif // CE_SDK_HANDLER_H diff --git a/src/plugins/qt4projectmanager/deployhelper.h b/src/plugins/qt4projectmanager/deployhelper.h index 8462f05b05c..b633ae34392 100644 --- a/src/plugins/qt4projectmanager/deployhelper.h +++ b/src/plugins/qt4projectmanager/deployhelper.h @@ -34,7 +34,7 @@ #ifndef DEPLOYHELPER_H #define DEPLOYHELPER_H -#include <projectexplorer/ProjectExplorerInterfaces> +#include <projectexplorer/buildstep.h> #include <QtCore/QString> #include <QtCore/QStringList> diff --git a/src/plugins/qt4projectmanager/gccparser.h b/src/plugins/qt4projectmanager/gccparser.h index 1b556dd6755..24b21cde6f3 100644 --- a/src/plugins/qt4projectmanager/gccparser.h +++ b/src/plugins/qt4projectmanager/gccparser.h @@ -34,7 +34,7 @@ #ifndef GCCPARSER_H #define GCCPARSER_H -#include <projectexplorer/ProjectExplorerInterfaces> +#include <projectexplorer/buildparserinterface.h> #include <QtCore/QRegExp> diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp index 2a032e63fd7..34d4a7e881f 100644 --- a/src/plugins/qt4projectmanager/makestep.cpp +++ b/src/plugins/qt4projectmanager/makestep.cpp @@ -36,7 +36,7 @@ #include "qt4project.h" #include "qt4projectmanagerconstants.h" -#include <extensionsystem/ExtensionSystemInterfaces> +#include <extensionsystem/pluginmanager.h> #include <utils/qtcassert.h> #include <QtCore/QDir> diff --git a/src/plugins/qt4projectmanager/makestep.h b/src/plugins/qt4projectmanager/makestep.h index 6312f08a1e1..0f0f189bfda 100644 --- a/src/plugins/qt4projectmanager/makestep.h +++ b/src/plugins/qt4projectmanager/makestep.h @@ -37,14 +37,13 @@ #include "qtversionmanager.h" #include "ui_makestep.h" -#include <projectexplorer/ProjectExplorerInterfaces> -#include <QDebug> +#include <projectexplorer/abstractprocessstep.h> +#include <projectexplorer/projectexplorer.h> namespace Qt4ProjectManager { class Qt4Project; - // NBS move this class to an own plugin? So that there can be a make project at a future time class MakeStep : public ProjectExplorer::AbstractProcessStep { diff --git a/src/plugins/qt4projectmanager/msvcenvironment.cpp b/src/plugins/qt4projectmanager/msvcenvironment.cpp index 2ae9bbebdf7..ebe54104f8d 100644 --- a/src/plugins/qt4projectmanager/msvcenvironment.cpp +++ b/src/plugins/qt4projectmanager/msvcenvironment.cpp @@ -33,12 +33,13 @@ #include "msvcenvironment.h" -#include <QSettings> -#include <QFile> -#include <QDebug> -#include <QStringList> -#include <QRegExp> -#include <QTemporaryFile> +#include <QtCore/QDebug> +#include <QtCore/QFile> +#include <QtCore/QProcess> +#include <QtCore/QRegExp> +#include <QtCore/QSettings> +#include <QtCore/QStringList> +#include <QtCore/QTemporaryFile> using namespace Qt4ProjectManager::Internal; using ProjectExplorer::Environment; diff --git a/src/plugins/qt4projectmanager/msvcenvironment.h b/src/plugins/qt4projectmanager/msvcenvironment.h index b3b50718256..c7d7729a99c 100644 --- a/src/plugins/qt4projectmanager/msvcenvironment.h +++ b/src/plugins/qt4projectmanager/msvcenvironment.h @@ -34,10 +34,10 @@ #ifndef MSVCENVIRONMENT_H #define MSVCENVIRONMENT_H -#include <QString> -#include <QList> +#include <QtCore/QString> +#include <QtCore/QList> -#include <projectexplorer/ProjectExplorerInterfaces> +#include <projectexplorer/projectexplorer.h> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/msvcparser.h b/src/plugins/qt4projectmanager/msvcparser.h index 6eaee5c97e9..06e0c3e6d61 100644 --- a/src/plugins/qt4projectmanager/msvcparser.h +++ b/src/plugins/qt4projectmanager/msvcparser.h @@ -34,7 +34,7 @@ #ifndef MSVCPARSER_H #define MSVCPARSER_H -#include <projectexplorer/ProjectExplorerInterfaces> +#include <projectexplorer/buildparserinterface.h> #include <QtCore/QRegExp> @@ -58,4 +58,4 @@ private: } // namespace ProjectExplorer -#endif // MsvcParser +#endif // MSVCPARSER_H diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h index 228aca7c2a3..d2d7980df04 100644 --- a/src/plugins/qt4projectmanager/qmakestep.h +++ b/src/plugins/qt4projectmanager/qmakestep.h @@ -34,10 +34,12 @@ #ifndef QMAKESTEP_H #define QMAKESTEP_H -#include <projectexplorer/ProjectExplorerInterfaces> +#include "ui_qmakestep.h" + +#include <projectexplorer/abstractprocessstep.h> + #include <QStringList> -#include "ui_qmakestep.h" namespace Qt4ProjectManager { @@ -46,10 +48,11 @@ class Qt4Project; class QMakeStep : public ProjectExplorer::AbstractProcessStep { Q_OBJECT + public: QMakeStep(Qt4Project * project); ~QMakeStep(); - virtual bool init(const QString & name); + virtual bool init(const QString &name); virtual void run(QFutureInterface<bool> &); virtual QString name(); virtual QString displayName(); @@ -58,6 +61,7 @@ public: QStringList arguments(const QString &buildConfiguration); void setForced(bool b); bool forced(); + protected: virtual void processStartupFailed(); virtual bool processFinished(int exitCode, QProcess::ExitStatus status); diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.cpp b/src/plugins/qt4projectmanager/qt4projectmanager.cpp index dd8413aec14..792ae2aed45 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager.cpp +++ b/src/plugins/qt4projectmanager/qt4projectmanager.cpp @@ -48,7 +48,9 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/iversioncontrol.h> #include <coreplugin/vcsmanager.h> +#include <projectexplorer/buildmanager.h> #include <projectexplorer/project.h> +#include <projectexplorer/projectexplorerconstants.h> #include <utils/listutils.h> #include <QtCore/QVariant> diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp index 01a0b91aae6..a8dfb4cb89d 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp +++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp @@ -48,7 +48,10 @@ #include "profilereader.h" #include "gdbmacrosbuildstep.h" +#include <projectexplorer/buildmanager.h> #include <projectexplorer/project.h> +#include <projectexplorer/projectexplorer.h> +#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectnodes.h> #include <coreplugin/uniqueidmanager.h> #include <coreplugin/mimedatabase.h> diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h index a9a76066a33..872b44b2178 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.h +++ b/src/plugins/qt4projectmanager/qtversionmanager.h @@ -38,7 +38,7 @@ #include <coreplugin/dialogs/ioptionspage.h> #include <coreplugin/icore.h> -#include <projectexplorer/ProjectExplorerInterfaces> +#include <projectexplorer/projectexplorer.h> #include <QtCore/QDebug> #include <QtCore/QPointer> diff --git a/src/plugins/qtscripteditor/qtscripteditorfactory.h b/src/plugins/qtscripteditor/qtscripteditorfactory.h index f97cdab1eed..08654aa0350 100644 --- a/src/plugins/qtscripteditor/qtscripteditorfactory.h +++ b/src/plugins/qtscripteditor/qtscripteditorfactory.h @@ -34,7 +34,6 @@ #ifndef RQTSCRIPTEDITORFACTORY_H #define RQTSCRIPTEDITORFACTORY_H -#include <extensionsystem/ExtensionSystemInterfaces> #include <coreplugin/editormanager/ieditorfactory.h> #include <QtCore/QStringList> diff --git a/src/plugins/resourceeditor/resourceeditorfactory.h b/src/plugins/resourceeditor/resourceeditorfactory.h index 0bcafd3ca56..4097fdecacc 100644 --- a/src/plugins/resourceeditor/resourceeditorfactory.h +++ b/src/plugins/resourceeditor/resourceeditorfactory.h @@ -34,16 +34,13 @@ #ifndef RRESOURCEEDITORFACTORY_H #define RRESOURCEEDITORFACTORY_H -#include <extensionsystem/ExtensionSystemInterfaces> #include <coreplugin/editormanager/ieditorfactory.h> #include <QtCore/QStringList> namespace Core { class ICore; -class IEditor; -class IFile; -} +} // namespace Core namespace ResourceEditor { namespace Internal { diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index a98848a8b37..811e4651415 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -55,7 +55,7 @@ #include <coreplugin/uniqueidmanager.h> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/editormanager/editormanager.h> -#include <projectexplorer/ProjectExplorerInterfaces> +#include <projectexplorer/projectexplorer.h> #include <utils/qtcassert.h> #include <QtCore/qplugin.h> diff --git a/src/plugins/subversion/subversionplugin.h b/src/plugins/subversion/subversionplugin.h index fb6bd17b7a9..729bbc909fd 100644 --- a/src/plugins/subversion/subversionplugin.h +++ b/src/plugins/subversion/subversionplugin.h @@ -39,8 +39,8 @@ #include <coreplugin/editormanager/ieditorfactory.h> #include <coreplugin/iversioncontrol.h> #include <coreplugin/icorelistener.h> -#include <extensionsystem/iplugin.h> #include <coreplugin/icorelistener.h> +#include <extensionsystem/iplugin.h> #include <QtCore/QObject> #include <QtCore/QProcess> |