genericprojectmanager: code cosmetic

White space, namespaces, include order, comments, literal style,
remove unneded include/declarations etc.

Change-Id: Ifcb4371699c5cde244be1610b67cf81915cad2b2
Reviewed-by: hjk <qthjk@ovi.com>

src/plugins/genericprojectmanager/filesselectionwizardpage.cpp

@@ -36,12 +36,13 @@
 
 #include <coreplugin/mimedatabase.h>
 #include <coreplugin/icore.h>
+
 #include <QVBoxLayout>
 #include <QLineEdit>
 #include <QPushButton>
 
-using namespace GenericProjectManager;
-using namespace GenericProjectManager::Internal;
+namespace GenericProjectManager {
+namespace Internal {
 
 FilesSelectionWizardPage::FilesSelectionWizardPage(GenericProjectWizardDialog *genericProjectWizard, QWidget *parent)
     : QWizardPage(parent), m_genericProjectWizardDialog(genericProjectWizard), m_model(0), m_finished(false)
@@ -143,3 +144,6 @@ void FilesSelectionWizardPage::applyFilter()
     Core::ICore::settings()->setValue(Constants::FILEFILTER_SETTING, filter);
     m_model->applyFilter(filter);
 }
+
+} // namespace Internal
+} // namespace GenericProjectManager

src/plugins/genericprojectmanager/filesselectionwizardpage.h

@@ -37,23 +37,27 @@
 
 namespace GenericProjectManager {
 namespace Internal {
+
 class GenericProjectWizardDialog;
 class SelectableFilesModel;
 
 class FilesSelectionWizardPage : public QWizardPage
 {
     Q_OBJECT
+
 public:
     FilesSelectionWizardPage(GenericProjectWizardDialog *genericProjectWizard, QWidget *parent = 0);
-    virtual bool isComplete() const;
-    virtual void initializePage();
-    virtual void cleanupPage();
+    bool isComplete() const;
+    void initializePage();
+    void cleanupPage();
     QStringList selectedFiles() const;
     QStringList selectedPaths() const;
+
 private slots:
     void applyFilter();
     void parsingProgress(const QString &text);
     void parsingFinished();
+
 private:
     GenericProjectWizardDialog *m_genericProjectWizardDialog;
     SelectableFilesModel *m_model;
@@ -65,6 +69,7 @@ private:
     bool m_finished;
 };
 
-}
-}
+} // namespace Internal
+} // namespace GenericProjectManager
+
 #endif // FILESSELECTIONWIZARDPAGE_H

src/plugins/genericprojectmanager/genericbuildconfiguration.cpp

@@ -43,37 +43,31 @@
 #include <QFormLayout>
 #include <QInputDialog>
 
-using namespace GenericProjectManager;
-using namespace GenericProjectManager::Internal;
-using ProjectExplorer::BuildConfiguration;
+using namespace ProjectExplorer;
 
-namespace {
-const char * const GENERIC_BC_ID("GenericProjectManager.GenericBuildConfiguration");
+namespace GenericProjectManager {
+namespace Internal {
 
-const char * const BUILD_DIRECTORY_KEY("GenericProjectManager.GenericBuildConfiguration.BuildDirectory");
-}
+const char GENERIC_BC_ID[] = "GenericProjectManager.GenericBuildConfiguration";
+const char BUILD_DIRECTORY_KEY[] = "GenericProjectManager.GenericBuildConfiguration.BuildDirectory";
 
-GenericBuildConfiguration::GenericBuildConfiguration(ProjectExplorer::Target *parent)
+GenericBuildConfiguration::GenericBuildConfiguration(Target *parent)
     : BuildConfiguration(parent, Core::Id(GENERIC_BC_ID))
 {
 }
 
-GenericBuildConfiguration::GenericBuildConfiguration(ProjectExplorer::Target *parent, const Core::Id id)
+GenericBuildConfiguration::GenericBuildConfiguration(Target *parent, const Core::Id id)
     : BuildConfiguration(parent, id)
 {
 }
 
-GenericBuildConfiguration::GenericBuildConfiguration(ProjectExplorer::Target *parent, GenericBuildConfiguration *source) :
+GenericBuildConfiguration::GenericBuildConfiguration(Target *parent, GenericBuildConfiguration *source) :
     BuildConfiguration(parent, source),
     m_buildDirectory(source->m_buildDirectory)
 {
     cloneSteps(source);
 }
 
-GenericBuildConfiguration::~GenericBuildConfiguration()
-{
-}
-
 QVariantMap GenericBuildConfiguration::toMap() const
 {
     QVariantMap map(BuildConfiguration::toMap());
@@ -112,15 +106,14 @@ void GenericBuildConfiguration::setBuildDirectory(const QString &buildDirectory)
     emit buildDirectoryChanged();
 }
 
-ProjectExplorer::BuildConfigWidget *GenericBuildConfiguration::createConfigWidget()
+BuildConfigWidget *GenericBuildConfiguration::createConfigWidget()
 {
     return new GenericBuildSettingsWidget;
 }
 
-ProjectExplorer::IOutputParser *GenericBuildConfiguration::createOutputParser() const
+IOutputParser *GenericBuildConfiguration::createOutputParser() const
 {
-    ProjectExplorer::ToolChain *tc =
-            ProjectExplorer::ToolChainProfileInformation::toolChain(target()->profile());
+    ToolChain *tc = ToolChainProfileInformation::toolChain(target()->profile());
     return tc ? tc->outputParser() : 0;
 }
 
@@ -130,7 +123,7 @@ ProjectExplorer::IOutputParser *GenericBuildConfiguration::createOutputParser()
 */
 
 GenericBuildConfigurationFactory::GenericBuildConfigurationFactory(QObject *parent) :
-    ProjectExplorer::IBuildConfigurationFactory(parent)
+    IBuildConfigurationFactory(parent)
 {
 }
 
@@ -138,7 +131,7 @@ GenericBuildConfigurationFactory::~GenericBuildConfigurationFactory()
 {
 }
 
-QList<Core::Id> GenericBuildConfigurationFactory::availableCreationIds(const ProjectExplorer::Target *parent) const
+QList<Core::Id> GenericBuildConfigurationFactory::availableCreationIds(const Target *parent) const
 {
     if (!canHandle(parent))
         return QList<Core::Id>();
@@ -152,7 +145,7 @@ QString GenericBuildConfigurationFactory::displayNameForId(const Core::Id id) co
     return QString();
 }
 
-bool GenericBuildConfigurationFactory::canCreate(const ProjectExplorer::Target *parent, const Core::Id id) const
+bool GenericBuildConfigurationFactory::canCreate(const Target *parent, const Core::Id id) const
 {
     if (!canHandle(parent))
         return false;
@@ -161,7 +154,7 @@ bool GenericBuildConfigurationFactory::canCreate(const ProjectExplorer::Target *
     return false;
 }
 
-BuildConfiguration *GenericBuildConfigurationFactory::create(ProjectExplorer::Target *parent, const Core::Id id, const QString &name)
+BuildConfiguration *GenericBuildConfigurationFactory::create(Target *parent, const Core::Id id, const QString &name)
 {
     if (!canCreate(parent, id))
         return 0;
@@ -183,8 +176,8 @@ BuildConfiguration *GenericBuildConfigurationFactory::create(ProjectExplorer::Ta
     GenericBuildConfiguration *bc = new GenericBuildConfiguration(parent);
     bc->setDisplayName(buildConfigurationName);
 
-    ProjectExplorer::BuildStepList *buildSteps = bc->stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
-    ProjectExplorer::BuildStepList *cleanSteps = bc->stepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN);
+    BuildStepList *buildSteps = bc->stepList(Constants::BUILDSTEPS_BUILD);
+    BuildStepList *cleanSteps = bc->stepList(Constants::BUILDSTEPS_CLEAN);
 
     Q_ASSERT(buildSteps);
     GenericMakeStep *makeStep = new GenericMakeStep(buildSteps);
@@ -200,24 +193,24 @@ BuildConfiguration *GenericBuildConfigurationFactory::create(ProjectExplorer::Ta
     return bc;
 }
 
-bool GenericBuildConfigurationFactory::canClone(const ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source) const
+bool GenericBuildConfigurationFactory::canClone(const Target *parent, BuildConfiguration *source) const
 {
     return canCreate(parent, source->id());
 }
 
-BuildConfiguration *GenericBuildConfigurationFactory::clone(ProjectExplorer::Target *parent, BuildConfiguration *source)
+BuildConfiguration *GenericBuildConfigurationFactory::clone(Target *parent, BuildConfiguration *source)
 {
     if (!canClone(parent, source))
         return 0;
     return new GenericBuildConfiguration(parent, qobject_cast<GenericBuildConfiguration *>(source));
 }
 
-bool GenericBuildConfigurationFactory::canRestore(const ProjectExplorer::Target *parent, const QVariantMap &map) const
+bool GenericBuildConfigurationFactory::canRestore(const Target *parent, const QVariantMap &map) const
 {
     return canCreate(parent, ProjectExplorer::idFromMap(map));
 }
 
-BuildConfiguration *GenericBuildConfigurationFactory::restore(ProjectExplorer::Target *parent, const QVariantMap &map)
+BuildConfiguration *GenericBuildConfigurationFactory::restore(Target *parent, const QVariantMap &map)
 {
     if (!canRestore(parent, map))
         return 0;
@@ -228,7 +221,7 @@ BuildConfiguration *GenericBuildConfigurationFactory::restore(ProjectExplorer::T
     return 0;
 }
 
-bool GenericBuildConfigurationFactory::canHandle(const ProjectExplorer::Target *t) const
+bool GenericBuildConfigurationFactory::canHandle(const Target *t) const
 {
     if (!t->project()->supportsProfile(t->profile()))
         return false;
@@ -258,7 +251,9 @@ GenericBuildSettingsWidget::GenericBuildSettingsWidget() : m_buildConfiguration(
 }
 
 QString GenericBuildSettingsWidget::displayName() const
-{ return tr("Generic Manager"); }
+{
+    return tr("Generic Manager");
+}
 
 void GenericBuildSettingsWidget::init(BuildConfiguration *bc)
 {
@@ -271,3 +266,6 @@ void GenericBuildSettingsWidget::buildDirectoryChanged()
 {
     m_buildConfiguration->setBuildDirectory(m_pathChooser->rawPath());
 }
+
+} // namespace Internal
+} // namespace GenericProjectManager

src/plugins/genericprojectmanager/genericbuildconfiguration.h

@@ -49,18 +49,15 @@ class GenericBuildConfiguration : public ProjectExplorer::BuildConfiguration
 
 public:
     explicit GenericBuildConfiguration(ProjectExplorer::Target *parent);
-    virtual ~GenericBuildConfiguration();
 
     ProjectExplorer::BuildConfigWidget *createConfigWidget();
-    virtual QString buildDirectory() const;
+    QString buildDirectory() const;
 
     QString rawBuildDirectory() const;
     void setBuildDirectory(const QString &buildDirectory);
 
     QVariantMap toMap() const;
-
     ProjectExplorer::IOutputParser *createOutputParser() const;
-
     BuildType buildType() const;
 
 protected:
@@ -115,4 +112,5 @@ private:
 
 } // namespace Internal
 } // namespace GenericProjectManager
+
 #endif // GENERICBUILDCONFIGURATION_H

src/plugins/genericprojectmanager/genericmakestep.cpp

@@ -46,41 +46,36 @@
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
 
-#include <QFormLayout>
-#include <QGroupBox>
-#include <QCheckBox>
-#include <QLineEdit>
-#include <QListWidget>
+using namespace Core;
+using namespace ProjectExplorer;
 
-using namespace GenericProjectManager;
-using namespace GenericProjectManager::Internal;
+namespace GenericProjectManager {
+namespace Internal {
 
-namespace {
-const char * const GENERIC_MS_ID("GenericProjectManager.GenericMakeStep");
-const char * const GENERIC_MS_DISPLAY_NAME(QT_TRANSLATE_NOOP("GenericProjectManager::Internal::GenericMakeStep",
-                                                             "Make"));
+const char GENERIC_MS_ID[] = "GenericProjectManager.GenericMakeStep";
+const char GENERIC_MS_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("GenericProjectManager::Internal::GenericMakeStep",
+                                                     "Make");
 
-const char * const BUILD_TARGETS_KEY("GenericProjectManager.GenericMakeStep.BuildTargets");
-const char * const MAKE_ARGUMENTS_KEY("GenericProjectManager.GenericMakeStep.MakeArguments");
-const char * const MAKE_COMMAND_KEY("GenericProjectManager.GenericMakeStep.MakeCommand");
-const char * const CLEAN_KEY("GenericProjectManager.GenericMakeStep.Clean");
-}
+const char BUILD_TARGETS_KEY[] = "GenericProjectManager.GenericMakeStep.BuildTargets";
+const char MAKE_ARGUMENTS_KEY[] = "GenericProjectManager.GenericMakeStep.MakeArguments";
+const char MAKE_COMMAND_KEY[] = "GenericProjectManager.GenericMakeStep.MakeCommand";
+const char CLEAN_KEY[] = "GenericProjectManager.GenericMakeStep.Clean";
 
-GenericMakeStep::GenericMakeStep(ProjectExplorer::BuildStepList *parent) :
-    AbstractProcessStep(parent, Core::Id(GENERIC_MS_ID)),
+GenericMakeStep::GenericMakeStep(BuildStepList *parent) :
+    AbstractProcessStep(parent, Id(GENERIC_MS_ID)),
     m_clean(false)
 {
     ctor();
 }
 
-GenericMakeStep::GenericMakeStep(ProjectExplorer::BuildStepList *parent, const Core::Id id) :
+GenericMakeStep::GenericMakeStep(BuildStepList *parent, const Id id) :
     AbstractProcessStep(parent, id),
     m_clean(false)
 {
     ctor();
 }
 
-GenericMakeStep::GenericMakeStep(ProjectExplorer::BuildStepList *parent, GenericMakeStep *bs) :
+GenericMakeStep::GenericMakeStep(BuildStepList *parent, GenericMakeStep *bs) :
     AbstractProcessStep(parent, bs),
     m_buildTargets(bs->m_buildTargets),
     m_makeArguments(bs->m_makeArguments),
@@ -111,7 +106,7 @@ bool GenericMakeStep::init()
     if (!bc)
         bc = static_cast<GenericBuildConfiguration *>(target()->activeBuildConfiguration());
 
-    ProjectExplorer::ProcessParameters *pp = processParameters();
+    ProcessParameters *pp = processParameters();
     pp->setMacroExpander(bc->macroExpander());
     pp->setWorkingDirectory(bc->buildDirectory());
     pp->setEnvironment(bc->environment());
@@ -123,9 +118,8 @@ bool GenericMakeStep::init()
     // That is mostly so that rebuild works on an already clean project
     setIgnoreReturnValue(m_clean);
 
-    setOutputParser(new ProjectExplorer::GnuMakeParser());
-    ProjectExplorer::ToolChain *tc =
-            ProjectExplorer::ToolChainProfileInformation::toolChain(bc->target()->profile());
+    setOutputParser(new GnuMakeParser());
+    ToolChain *tc = ToolChainProfileInformation::toolChain(bc->target()->profile());
     if (tc)
         appendOutputParser(tc->outputParser());
     outputParser()->setWorkingDirectory(pp->effectiveWorkingDirectory());
@@ -175,7 +169,7 @@ QString GenericMakeStep::makeCommand() const
 {
     QString command = m_makeCommand;
     if (command.isEmpty()) {
-        ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainProfileInformation::toolChain(target()->profile());
+        ToolChain *tc = ToolChainProfileInformation::toolChain(target()->profile());
         if (tc)
             command = tc->makeCommand();
         else
@@ -189,7 +183,7 @@ void GenericMakeStep::run(QFutureInterface<bool> &fi)
     AbstractProcessStep::run(fi);
 }
 
-ProjectExplorer::BuildStepConfigWidget *GenericMakeStep::createConfigWidget()
+BuildStepConfigWidget *GenericMakeStep::createConfigWidget()
 {
     return new GenericMakeStepConfigWidget(this);
 }
@@ -244,9 +238,9 @@ GenericMakeStepConfigWidget::GenericMakeStepConfigWidget(GenericMakeStep *makeSt
     connect(m_ui->makeArgumentsLineEdit, SIGNAL(textEdited(QString)),
             this, SLOT(makeArgumentsLineEditTextEdited()));
 
-    connect(ProjectExplorer::ProjectExplorerPlugin::instance(), SIGNAL(settingsChanged()),
+    connect(ProjectExplorerPlugin::instance(), SIGNAL(settingsChanged()),
             this, SLOT(updateMakeOverrrideLabel()));
-    connect(ProjectExplorer::ProjectExplorerPlugin::instance(), SIGNAL(settingsChanged()),
+    connect(ProjectExplorerPlugin::instance(), SIGNAL(settingsChanged()),
             this, SLOT(updateDetails()));
 
     connect(m_makeStep->target(), SIGNAL(profileChanged()),
@@ -274,7 +268,7 @@ void GenericMakeStepConfigWidget::updateDetails()
     if (!bc)
         bc = static_cast<GenericBuildConfiguration *>(m_makeStep->target()->activeBuildConfiguration());
 
-    ProjectExplorer::ProcessParameters param;
+    ProcessParameters param;
     param.setMacroExpander(bc->macroExpander());
     param.setWorkingDirectory(bc->buildDirectory());
     param.setEnvironment(bc->environment());
@@ -312,24 +306,18 @@ void GenericMakeStepConfigWidget::makeArgumentsLineEditTextEdited()
 //
 
 GenericMakeStepFactory::GenericMakeStepFactory(QObject *parent) :
-    ProjectExplorer::IBuildStepFactory(parent)
+    IBuildStepFactory(parent)
 {
 }
 
-GenericMakeStepFactory::~GenericMakeStepFactory()
-{
-}
-
-bool GenericMakeStepFactory::canCreate(ProjectExplorer::BuildStepList *parent,
-                                       const Core::Id id) const
+bool GenericMakeStepFactory::canCreate(BuildStepList *parent, const Id id) const
 {
     if (parent->target()->project()->id() == Constants::GENERICPROJECT_ID)
         return id == GENERIC_MS_ID;
     return false;
 }
 
-ProjectExplorer::BuildStep *GenericMakeStepFactory::create(ProjectExplorer::BuildStepList *parent,
-                                                           const Core::Id id)
+BuildStep *GenericMakeStepFactory::create(BuildStepList *parent, const Id id)
 {
     if (!canCreate(parent, id))
         return 0;
@@ -343,14 +331,12 @@ ProjectExplorer::BuildStep *GenericMakeStepFactory::create(ProjectExplorer::Buil
     return step;
 }
 
-bool GenericMakeStepFactory::canClone(ProjectExplorer::BuildStepList *parent,
-                                      ProjectExplorer::BuildStep *source) const
+bool GenericMakeStepFactory::canClone(BuildStepList *parent, BuildStep *source) const
 {
     return canCreate(parent, source->id());
 }
 
-ProjectExplorer::BuildStep *GenericMakeStepFactory::clone(ProjectExplorer::BuildStepList *parent,
-                                                          ProjectExplorer::BuildStep *source)
+BuildStep *GenericMakeStepFactory::clone(BuildStepList *parent, BuildStep *source)
 {
     if (!canClone(parent, source))
         return 0;
@@ -359,14 +345,12 @@ ProjectExplorer::BuildStep *GenericMakeStepFactory::clone(ProjectExplorer::Build
     return new GenericMakeStep(parent, old);
 }
 
-bool GenericMakeStepFactory::canRestore(ProjectExplorer::BuildStepList *parent,
-                                        const QVariantMap &map) const
+bool GenericMakeStepFactory::canRestore(BuildStepList *parent, const QVariantMap &map) const
 {
-    return canCreate(parent, ProjectExplorer::idFromMap(map));
+    return canCreate(parent, idFromMap(map));
 }
 
-ProjectExplorer::BuildStep *GenericMakeStepFactory::restore(ProjectExplorer::BuildStepList *parent,
-                                                            const QVariantMap &map)
+BuildStep *GenericMakeStepFactory::restore(BuildStepList *parent, const QVariantMap &map)
 {
     if (!canRestore(parent, map))
         return 0;
@@ -377,17 +361,20 @@ ProjectExplorer::BuildStep *GenericMakeStepFactory::restore(ProjectExplorer::Bui
     return 0;
 }
 
-QList<Core::Id> GenericMakeStepFactory::availableCreationIds(ProjectExplorer::BuildStepList *parent) const
+QList<Id> GenericMakeStepFactory::availableCreationIds(BuildStepList *parent) const
 {
     if (parent->target()->project()->id() == Constants::GENERICPROJECT_ID)
-        return QList<Core::Id>() << Core::Id(GENERIC_MS_ID);
-    return QList<Core::Id>();
+        return QList<Id>() << Id(GENERIC_MS_ID);
+    return QList<Id>();
 }
 
-QString GenericMakeStepFactory::displayNameForId(const Core::Id id) const
+QString GenericMakeStepFactory::displayNameForId(const Id id) const
 {
     if (id == GENERIC_MS_ID)
         return QCoreApplication::translate("GenericProjectManager::Internal::GenericMakeStep",
                                            GENERIC_MS_DISPLAY_NAME);
     return QString();
 }
+
+} // namespace Internal
+} // namespace GenericProjectManager

src/plugins/genericprojectmanager/genericmakestep.h

@@ -54,16 +54,15 @@ class GenericMakeStep : public ProjectExplorer::AbstractProcessStep
 
 public:
     GenericMakeStep(ProjectExplorer::BuildStepList *parent);
-    virtual ~GenericMakeStep();
+    ~GenericMakeStep();
 
     GenericBuildConfiguration *genericBuildConfiguration() const;
 
-    virtual bool init();
+    bool init();
+    void run(QFutureInterface<bool> &fi);
 
-    virtual void run(QFutureInterface<bool> &fi);
-
-    virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
-    virtual bool immutable() const;
+    ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
+    bool immutable() const;
     bool buildsTarget(const QString &target) const;
     void setBuildTarget(const QString &target, bool on);
     QString allArguments() const;
@@ -77,7 +76,7 @@ public:
 protected:
     GenericMakeStep(ProjectExplorer::BuildStepList *parent, GenericMakeStep *bs);
     GenericMakeStep(ProjectExplorer::BuildStepList *parent, const Core::Id id);
-    virtual bool fromMap(const QVariantMap &map);
+    bool fromMap(const QVariantMap &map);
 
 private:
     void ctor();
@@ -88,20 +87,23 @@ private:
     bool m_clean;
 };
 
-class GenericMakeStepConfigWidget :public ProjectExplorer::BuildStepConfigWidget
+class GenericMakeStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
 {
     Q_OBJECT
+
 public:
     GenericMakeStepConfigWidget(GenericMakeStep *makeStep);
     ~GenericMakeStepConfigWidget();
-    virtual QString displayName() const;
-    virtual QString summaryText() const;
+    QString displayName() const;
+    QString summaryText() const;
+
 private slots:
-    void itemChanged(QListWidgetItem*);
+    void itemChanged(QListWidgetItem *item);
     void makeLineEditTextEdited();
     void makeArgumentsLineEditTextEdited();
     void updateMakeOverrrideLabel();
     void updateDetails();
+
 private:
     Ui::GenericMakeStep *m_ui;
     GenericMakeStep *m_makeStep;
@@ -114,7 +116,6 @@ class GenericMakeStepFactory : public ProjectExplorer::IBuildStepFactory
 
 public:
     explicit GenericMakeStepFactory(QObject *parent = 0);
-    ~GenericMakeStepFactory();
 
     bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const;
     ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);

src/plugins/genericprojectmanager/genericproject.cpp

@@ -31,10 +31,14 @@
 #include "genericproject.h"
 
 #include "genericbuildconfiguration.h"
-#include "genericprojectconstants.h"
-
 #include "genericmakestep.h"
+#include "genericprojectconstants.h"
 
+#include <coreplugin/documentmanager.h>
+#include <coreplugin/icontext.h>
+#include <coreplugin/icore.h>
+#include <cpptools/ModelManagerInterface.h>
+#include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/abi.h>
 #include <projectexplorer/buildenvironmentwidget.h>
 #include <projectexplorer/buildsteplist.h>
@@ -43,33 +47,30 @@
 #include <projectexplorer/profilemanager.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <qtsupport/customexecutablerunconfiguration.h>
-#include <cpptools/ModelManagerInterface.h>
-#include <extensionsystem/pluginmanager.h>
-#include <utils/qtcassert.h>
 #include <utils/fileutils.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/icontext.h>
-#include <coreplugin/documentmanager.h>
+#include <utils/qtcassert.h>
 
 #include <QDir>
 #include <QProcessEnvironment>
 
-#include <QComboBox>
-
-using namespace GenericProjectManager;
-using namespace GenericProjectManager::Internal;
+using namespace Core;
 using namespace ProjectExplorer;
 
+namespace GenericProjectManager {
+namespace Internal {
+
 ////////////////////////////////////////////////////////////////////////////////////
+//
 // GenericProject
+//
 ////////////////////////////////////////////////////////////////////////////////////
 
 GenericProject::GenericProject(Manager *manager, const QString &fileName)
     : m_manager(manager),
       m_fileName(fileName)
 {
-    setProjectContext(Core::Context(GenericProjectManager::Constants::PROJECTCONTEXT));
-    setProjectLanguage(Core::Context(ProjectExplorer::Constants::LANG_CXX));
+    setProjectContext(Context(GenericProjectManager::Constants::PROJECTCONTEXT));
+    setProjectLanguage(Context(ProjectExplorer::Constants::LANG_CXX));
 
     QFileInfo fileInfo(m_fileName);
     QDir dir = fileInfo.dir();
@@ -84,10 +85,10 @@ GenericProject::GenericProject(Manager *manager, const QString &fileName)
     m_includesIDocument = new GenericProjectFile(this, m_includesFileName, GenericProject::Configuration);
     m_configIDocument   = new GenericProjectFile(this, m_configFileName, GenericProject::Configuration);
 
-    Core::DocumentManager::addDocument(m_creatorIDocument);
-    Core::DocumentManager::addDocument(m_filesIDocument);
-    Core::DocumentManager::addDocument(m_includesIDocument);
-    Core::DocumentManager::addDocument(m_configIDocument);
+    DocumentManager::addDocument(m_creatorIDocument);