remove ProjectExplorerInterface and ExtensionSystemInterfaces files

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 {

src/libs/extensionsystem/ExtensionSystemInterfaces

@@ -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"

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*)

src/plugins/coreplugin/baseview.cpp

@@ -33,7 +33,7 @@
 
 #include "baseview.h"
 
-#include <extensionsystem/ExtensionSystemInterfaces>
+#include <QtGui/QWidget>
 
 using namespace Core;
 

src/plugins/coreplugin/coreconstants.h

@@ -34,8 +34,6 @@
 #ifndef CORECONSTANTS_H
 #define CORECONSTANTS_H
 
-#include <extensionsystem/ExtensionSystemInterfaces>
-
 namespace Core {
 namespace Constants {
 

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>

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>

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>

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>
 

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;

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>

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"
 

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 IEditorFactory;
-    class ICore;
+class ICore;
-    class IVersionControl;
+class IVersionControl;
-}
+} // namespace Core
 
 namespace Git {
 namespace Internal {
 
-    class GitPlugin;
+class GitPlugin;
-    class GitClient;
+class GitClient;
-    class ChangeSelectionDialog;
+class ChangeSelectionDialog;
-    class GitSubmitEditor;
+class GitSubmitEditor;
-    struct CommitData;
+struct CommitData;
-    struct GitSettings;
+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
+    bool initialize(const QStringList &arguments, QString *error_message);
-                                           , QString *error_message);
+    void extensionsInitialized();
-    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();
+    void updateActions();
-    bool                        editorAboutToClose(Core::IEditor *editor);
+    bool editorAboutToClose(Core::IEditor *editor);
 
 private slots:
-    void                        diffCurrentFile();
+    void diffCurrentFile();
-    void                        diffCurrentProject();
+    void diffCurrentProject();
-    void                        submitEditorDiff(const QStringList &unstaged, const QStringList &staged);
+    void submitEditorDiff(const QStringList &unstaged, const QStringList &staged);
-    void                        submitCurrentLog();
+    void submitCurrentLog();
-    void                        statusFile();
+    void statusFile();
-    void                        statusProject();
+    void statusProject();
-    void                        logFile();
+    void logFile();
-    void                        blameFile();
+    void blameFile();
-    void                        logProject();
+    void logProject();
-    void                        undoFileChanges();
+    void undoFileChanges();
-    void                        undoProjectChanges();
+    void undoProjectChanges();
-    void                        stageFile();
+    void stageFile();
-    void                        unstageFile();
+    void unstageFile();
-    void                        revertFile();
+    void revertFile();
 
-    void                        showCommit();
+    void showCommit();
-    void                        startCommit();
+    void startCommit();
-    void                        stash();
+    void stash();
-    void                        stashPop();
+    void stashPop();
-    void                        branchList();
+    void branchList();
-    void                        stashList();
+    void stashList();
-    void                        pull();
+    void pull();
-    void                        push();
+    void push();
 
 private:
-    QFileInfo                   currentFile() const;
+    QFileInfo currentFile() const;
-    Core::IEditor               *openSubmitEditor(const QString &fileName, const CommitData &cd);
+    Core::IEditor *openSubmitEditor(const QString &fileName, const CommitData &cd);
-    void                        cleanChangeTmpFile();
+    void cleanChangeTmpFile();
 
-    static GitPlugin            *m_instance;
+    static GitPlugin *m_instance;
-    Core::ICore                 *m_core;
+    Core::ICore *m_core;
-    QAction                     *m_diffAction;
+    QAction *m_diffAction;
-    QAction                     *m_diffProjectAction;
+    QAction *m_diffProjectAction;
-    QAction                     *m_statusAction;
+    QAction *m_statusAction;
-    QAction                     *m_statusProjectAction;
+    QAction *m_statusProjectAction;
-    QAction                     *m_logAction;
+    QAction *m_logAction;
-    QAction                     *m_blameAction;
+    QAction *m_blameAction;
-    QAction                     *m_logProjectAction;
+    QAction *m_logProjectAction;
-    QAction                     *m_undoFileAction;
+    QAction *m_undoFileAction;
-    QAction                     *m_undoProjectAction;
+    QAction *m_undoProjectAction;
-    QAction                     *m_showAction;
+    QAction *m_showAction;
-    QAction                     *m_stageAction;
+    QAction *m_stageAction;
-    QAction                     *m_unstageAction;
+    QAction *m_unstageAction;
-    QAction                     *m_revertAction;
+    QAction *m_revertAction;
-    QAction                     *m_commitAction;
+    QAction *m_commitAction;
-    QAction                     *m_pullAction;
+    QAction *m_pullAction;
-    QAction                     *m_pushAction;
+    QAction *m_pushAction;
 
-    QAction                     *m_submitCurrentAction;
+    QAction *m_submitCurrentAction;
-    QAction                     *m_diffSelectedFilesAction;
+    QAction *m_diffSelectedFilesAction;
-    QAction                     *m_undoAction;
+    QAction *m_undoAction;
-    QAction                     *m_redoAction;
+    QAction *m_redoAction;
-    QAction                     *m_stashAction;
+    QAction *m_stashAction;
-    QAction                     *m_stashPopAction;
+    QAction *m_stashPopAction;
-    QAction                     *m_stashListAction;
+    QAction *m_stashListAction;
-    QAction                     *m_branchListAction;
+    QAction *m_branchListAction;
 
     ProjectExplorer::ProjectExplorerPlugin *m_projectExplorer;
     GitClient                   *m_gitClient;

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"

src/plugins/projectexplorer/ProjectExplorerInterfaces

@@ -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"

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;
 

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

src/plugins/qt4projectmanager/cesdkhandler.h

@@ -31,13 +31,13 @@
 **
 ***************************************************************************/
 
-#ifndef CE_SDK_HANDLER_INCL
+#ifndef CE_SDK_HANDLER_H
-#define CE_SDK_HANDLER_INCL
+#define CE_SDK_HANDLER_H
 
-#include <projectexplorer/ProjectExplorerInterfaces>
+#include <projectexplorer/projectexplorer.h>
 
-#include <QStringList>
+#include <QtCore/QStringList>
-#include <QDir>
+#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

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>

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>
 

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>

src/plugins/qt4projectmanager/makestep.h

@@ -37,14 +37,13 @@
 #include "qtversionmanager.h"
 #include "ui_makestep.h"
 
-#include <projectexplorer/ProjectExplorerInterfaces>
+#include <projectexplorer/abstractprocessstep.h>
-#include <QDebug>
+#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
 {

src/plugins/qt4projectmanager/msvcenvironment.cpp

@@ -33,12 +33,13 @@
 
 #include "msvcenvironment.h"
 
-#include <QSettings>
+#include <QtCore/QDebug>
-#include <QFile>
+#include <QtCore/QFile>
-#include <QDebug>
+#include <QtCore/QProcess>
-#include <QStringList>
+#include <QtCore/QRegExp>
-#include <QRegExp>
+#include <QtCore/QSettings>
-#include <QTemporaryFile>
+#include <QtCore/QStringList>
+#include <QtCore/QTemporaryFile>
 
 using namespace Qt4ProjectManager::Internal;
 using ProjectExplorer::Environment;

src/plugins/qt4projectmanager/msvcenvironment.h

@@ -34,10 +34,10 @@
 #ifndef MSVCENVIRONMENT_H
 #define MSVCENVIRONMENT_H
 
-#include <QString>
+#include <QtCore/QString>
-#include <QList>
+#include <QtCore/QList>
 
-#include <projectexplorer/ProjectExplorerInterfaces>
+#include <projectexplorer/projectexplorer.h>
 
 namespace Qt4ProjectManager {
 namespace Internal {

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

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);

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>

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>

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>

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>

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;
+} // namespace Core
-class IFile;
-}
 
 namespace ResourceEditor {
 namespace Internal {

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>

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>