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>

22 files changed, 266 insertions, 288 deletions

diff --git a/src/plugins/genericprojectmanager/filesselectionwizardpage.cpp b/src/plugins/genericprojectmanager/filesselectionwizardpage.cpp
index 12d2e5344e..e452311803 100644
--- a/src/plugins/genericprojectmanager/filesselectionwizardpage.cpp
+++ b/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
diff --git a/src/plugins/genericprojectmanager/filesselectionwizardpage.h b/src/plugins/genericprojectmanager/filesselectionwizardpage.h
index 8ec5ee764a..d890171195 100644
--- a/src/plugins/genericprojectmanager/filesselectionwizardpage.h
+++ b/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
diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
index 0eb1f56fd7..8dffe02457 100644
--- a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
+++ b/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
diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.h b/src/plugins/genericprojectmanager/genericbuildconfiguration.h
index 67294ee2fc..629ed81481 100644
--- a/src/plugins/genericprojectmanager/genericbuildconfiguration.h
+++ b/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
diff --git a/src/plugins/genericprojectmanager/genericmakestep.cpp b/src/plugins/genericprojectmanager/genericmakestep.cpp
index bc6f5babe9..97ae8253ae 100644
--- a/src/plugins/genericprojectmanager/genericmakestep.cpp
+++ b/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
diff --git a/src/plugins/genericprojectmanager/genericmakestep.h b/src/plugins/genericprojectmanager/genericmakestep.h
index d1d94287d3..769cabcfa6 100644
--- a/src/plugins/genericprojectmanager/genericmakestep.h
+++ b/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);
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 769e12f25a..4ca7380b41 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/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);
+    DocumentManager::addDocument(m_filesIDocument);
+    DocumentManager::addDocument(m_includesIDocument);
+    DocumentManager::addDocument(m_configIDocument);
 
     m_rootNode = new GenericProjectNode(this, m_creatorIDocument);
 
@@ -147,7 +148,7 @@ bool GenericProject::saveRawFileList(const QStringList &rawFileList)
             stream << filePath << QLatin1Char('\n');
         saver.setResult(&stream);
     }
-    if (!saver.finalize(Core::ICore::mainWindow()))
+    if (!saver.finalize(ICore::mainWindow()))
         return false;
     refresh(GenericProject::Files);
     return true;
@@ -249,7 +250,7 @@ void GenericProject::refresh(RefreshOptions options)
                     new CPlusPlus::CppModelManagerInterface::ProjectPart);
 
         ToolChain *tc = activeTarget() ?
-                    ProjectExplorer::ToolChainProfileInformation::toolChain(activeTarget()->profile()) : 0;
+                    ToolChainProfileInformation::toolChain(activeTarget()->profile()) : 0;
         if (tc) {
             part->defines = tc->predefinedMacros(QStringList());
             part->defines += '\n';
@@ -383,12 +384,12 @@ QString GenericProject::displayName() const
     return m_projectName;
 }
 
-Core::Id GenericProject::id() const
+Id GenericProject::id() const
 {
-    return Core::Id(Constants::GENERICPROJECT_ID);
+    return Id(Constants::GENERICPROJECT_ID);
 }
 
-Core::IDocument *GenericProject::document() const
+IDocument *GenericProject::document() const
 {
     return m_creatorIDocument;
 }
@@ -458,19 +459,18 @@ void GenericProject::evaluateBuildSystem()
 }
 
 ////////////////////////////////////////////////////////////////////////////////////
+//
 // GenericProjectFile
+//
 ////////////////////////////////////////////////////////////////////////////////////
 
 GenericProjectFile::GenericProjectFile(GenericProject *parent, QString fileName, GenericProject::RefreshOptions options)
-    : Core::IDocument(parent),
+    : IDocument(parent),
       m_project(parent),
       m_fileName(fileName),
       m_options(options)
 { }
 
-GenericProjectFile::~GenericProjectFile()
-{ }
-
 bool GenericProjectFile::save(QString *, const QString &, bool)
 {
     return false;
@@ -513,7 +513,7 @@ void GenericProjectFile::rename(const QString &newName)
     QTC_CHECK(false);
 }
 
-Core::IDocument::ReloadBehavior GenericProjectFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
+IDocument::ReloadBehavior GenericProjectFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
 {
     Q_UNUSED(state)
     Q_UNUSED(type)
@@ -529,3 +529,6 @@ bool GenericProjectFile::reload(QString *errorString, ReloadFlag flag, ChangeTyp
     m_project->refresh(m_options);
     return true;
 }
+
+} // namespace Internal
+} // namespace GenericProjectManager
diff --git a/src/plugins/genericprojectmanager/genericproject.h b/src/plugins/genericprojectmanager/genericproject.h
index c0dcd25e8c..106f306640 100644
--- a/src/plugins/genericprojectmanager/genericproject.h
+++ b/src/plugins/genericprojectmanager/genericproject.h
@@ -43,19 +43,9 @@
 
 #include <QFuture>
 
-QT_BEGIN_NAMESPACE
-class QComboBox;
-QT_END_NAMESPACE
-
-namespace ProjectExplorer { class ToolChain; }
-
 namespace GenericProjectManager {
 namespace Internal {
 
-class GenericBuildConfiguration;
-class GenericProject;
-class GenericTarget;
-class GenericMakeStep;
 class GenericProjectFile;
 
 class GenericProject : public ProjectExplorer::Project
@@ -64,7 +54,7 @@ class GenericProject : public ProjectExplorer::Project
 
 public:
     GenericProject(Manager *manager, const QString &filename);
-    virtual ~GenericProject();
+    ~GenericProject();
 
     QString filesFileName() const;
     QString includesFileName() const;
@@ -142,18 +132,17 @@ class GenericProjectFile : public Core::IDocument
 
 public:
     GenericProjectFile(GenericProject *parent, QString fileName, GenericProject::RefreshOptions options);
-    virtual ~GenericProjectFile();
 
-    virtual bool save(QString *errorString, const QString &fileName, bool autoSave);
-    virtual QString fileName() const;
+    bool save(QString *errorString, const QString &fileName, bool autoSave);
+    QString fileName() const;
 
-    virtual QString defaultPath() const;
-    virtual QString suggestedFileName() const;
-    virtual QString mimeType() const;
+    QString defaultPath() const;
+    QString suggestedFileName() const;
+    QString mimeType() const;
 
-    virtual bool isModified() const;
-    virtual bool isSaveAsAllowed() const;
-    virtual void rename(const QString &newName);
+    bool isModified() const;
+    bool isSaveAsAllowed() const;
+    void rename(const QString &newName);
 
     ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const;
     bool reload(QString *errorString, ReloadFlag flag, ChangeType type);
diff --git a/src/plugins/genericprojectmanager/genericprojectconstants.h b/src/plugins/genericprojectmanager/genericprojectconstants.h
index fe09652b5a..7860a0f35a 100644
--- a/src/plugins/genericprojectmanager/genericprojectconstants.h
+++ b/src/plugins/genericprojectmanager/genericprojectconstants.h
@@ -34,28 +34,22 @@
 namespace GenericProjectManager {
 namespace Constants {
 
-const char *const PROJECTCONTEXT     = "GenericProject.ProjectContext";
-const char *const GENERICMIMETYPE    = "text/x-generic-project"; // ### FIXME
+const char PROJECTCONTEXT[]     = "GenericProject.ProjectContext";
+const char GENERICMIMETYPE[]    = "text/x-generic-project"; // ### FIXME
 
-// contexts
-const char *const C_FILESEDITOR      = ".files Editor";
+// Contexts
+const char C_FILESEDITOR[]      = ".files Editor";
+const char FILES_EDITOR_ID[]    = "QT4.FilesEditor";
 
-const char *const FILES_EDITOR_ID    = "QT4.FilesEditor";
-const char *const FILES_EDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("OpenWith::Editors", ".files Editor");
-
-const char *const FILES_MIMETYPE     = "application/vnd.nokia.qt.generic.files";
-
-const char *const INCLUDES_MIMETYPE  = "application/vnd.nokia.qt.generic.includes";
-
-const char *const CONFIG_MIMETYPE    = "application/vnd.nokia.qt.generic.config";
+const char FILES_MIMETYPE[]     = "application/vnd.nokia.qt.generic.files";
+const char INCLUDES_MIMETYPE[]  = "application/vnd.nokia.qt.generic.includes";
+const char CONFIG_MIMETYPE[]    = "application/vnd.nokia.qt.generic.config";
 
 // Project
-const char *const GENERICPROJECT_ID  = "GenericProjectManager.GenericProject";
-
-const char *const EDITFILESACTION = "GenericProjectManager.EditFiles";
+const char GENERICPROJECT_ID[]  = "GenericProjectManager.GenericProject";
 
-const char *const FILEFILTER_SETTING = "GenericProject/FileFilter";
-const char *const FILEFILTER_DEFAULT = "Makefile*; *.o; *.obj; *~; *.files; *.config; *.creator; *.user; *.includes";
+const char FILEFILTER_SETTING[] = "GenericProject/FileFilter";
+const char FILEFILTER_DEFAULT[] = "Makefile*; *.o; *.obj; *~; *.files; *.config; *.creator; *.user; *.includes";
 
 } // namespace Constants
 } // namespace GenericProjectManager
diff --git a/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp b/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
index 738e47939b..9dae12fc52 100644
--- a/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
@@ -39,16 +39,18 @@
 
 #include <QCoreApplication>
 
-using namespace GenericProjectManager;
-using namespace GenericProjectManager::Internal;
+using namespace TextEditor;
 
+namespace GenericProjectManager {
+namespace Internal {
 
 ////////////////////////////////////////////////////////////////////////////////////////
+//
 // ProjectFilesFactory
+//
 ////////////////////////////////////////////////////////////////////////////////////////
 
-ProjectFilesFactory::ProjectFilesFactory(Manager *manager,
-                                         TextEditor::TextEditorActionHandler *handler)
+ProjectFilesFactory::ProjectFilesFactory(Manager *manager, TextEditorActionHandler *handler)
     : Core::IEditorFactory(manager),
       m_actionHandler(handler)
 {
@@ -60,7 +62,7 @@ ProjectFilesFactory::ProjectFilesFactory(Manager *manager,
 Core::IEditor *ProjectFilesFactory::createEditor(QWidget *parent)
 {
     ProjectFilesEditorWidget *ed = new ProjectFilesEditorWidget(parent, this, m_actionHandler);
-    TextEditor::TextEditorSettings::instance()->initializeEditor(ed);
+    TextEditorSettings::instance()->initializeEditor(ed);
     return ed->editor();
 }
 
@@ -76,15 +78,17 @@ Core::Id ProjectFilesFactory::id() const
 
 QString ProjectFilesFactory::displayName() const
 {
-    return qApp->translate("OpenWith::Editors", Constants::FILES_EDITOR_DISPLAY_NAME);
+    return  QCoreApplication::translate("OpenWith::Editors", ".files Editor");
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////
+//
 // ProjectFilesEditable
+//
 ////////////////////////////////////////////////////////////////////////////////////////
 
 ProjectFilesEditor::ProjectFilesEditor(ProjectFilesEditorWidget *editor)
-  : TextEditor::BaseTextEditor(editor)
+  : BaseTextEditor(editor)
 {
    setContext(Core::Context(Constants::C_FILESEDITOR));
 }
@@ -105,40 +109,42 @@ Core::IEditor *ProjectFilesEditor::duplicate(QWidget *parent)
     ProjectFilesEditorWidget *editor = new ProjectFilesEditorWidget(parent,
                                                         parentEditor->factory(),
                                                         parentEditor->actionHandler());
-    TextEditor::TextEditorSettings::instance()->initializeEditor(editor);
+    TextEditorSettings::instance()->initializeEditor(editor);
     return editor->editor();
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////
+//
 // ProjectFilesEditor
+//
 ////////////////////////////////////////////////////////////////////////////////////////
 
 ProjectFilesEditorWidget::ProjectFilesEditorWidget(QWidget *parent, ProjectFilesFactory *factory,
-                                       TextEditor::TextEditorActionHandler *handler)
-    : TextEditor::BaseTextEditorWidget(parent),
+                                       TextEditorActionHandler *handler)
+    : BaseTextEditorWidget(parent),
       m_factory(factory),
       m_actionHandler(handler)
 {
-    TextEditor::BaseTextDocument *doc = new TextEditor::BaseTextDocument();
+    BaseTextDocument *doc = new BaseTextDocument();
     setBaseTextDocument(doc);
 
     handler->setupActions(this);
 }
 
-ProjectFilesEditorWidget::~ProjectFilesEditorWidget()
-{ }
-
 ProjectFilesFactory *ProjectFilesEditorWidget::factory() const
 {
     return m_factory;
 }
 
-TextEditor::TextEditorActionHandler *ProjectFilesEditorWidget::actionHandler() const
+TextEditorActionHandler *ProjectFilesEditorWidget::actionHandler() const
 {
     return m_actionHandler;
 }
 
-TextEditor::BaseTextEditor *ProjectFilesEditorWidget::createEditor()
+BaseTextEditor *ProjectFilesEditorWidget::createEditor()
 {
     return new ProjectFilesEditor(this);
 }
+
+} // namespace Internal
+} // namespace GenericProjectManager
diff --git a/src/plugins/genericprojectmanager/genericprojectfileseditor.h b/src/plugins/genericprojectmanager/genericprojectfileseditor.h
index ce89dea31d..e9784b999b 100644
--- a/src/plugins/genericprojectmanager/genericprojectfileseditor.h
+++ b/src/plugins/genericprojectmanager/genericprojectfileseditor.h
@@ -55,11 +55,11 @@ class ProjectFilesFactory: public Core::IEditorFactory
 public:
     ProjectFilesFactory(Manager *manager, TextEditor::TextEditorActionHandler *handler);
 
-    virtual Core::IEditor *createEditor(QWidget *parent);
+    Core::IEditor *createEditor(QWidget *parent);
 
-    virtual QStringList mimeTypes() const;
-    virtual Core::Id id() const;
-    virtual QString displayName() const;
+    QStringList mimeTypes() const;
+    Core::Id id() const;
+    QString displayName() const;
 
 private:
     TextEditor::TextEditorActionHandler *m_actionHandler;
@@ -73,10 +73,10 @@ class ProjectFilesEditor : public TextEditor::BaseTextEditor
 public:
     ProjectFilesEditor(ProjectFilesEditorWidget *editorWidget);
 
-    virtual Core::Id id() const;
-    virtual bool duplicateSupported() const;
-    virtual Core::IEditor *duplicate(QWidget *parent);
-    virtual bool isTemporary() const { return false; }
+    Core::Id id() const;
+    bool duplicateSupported() const;
+    Core::IEditor *duplicate(QWidget *parent);
+    bool isTemporary() const { return false; }
 };
 
 class ProjectFilesEditorWidget : public TextEditor::BaseTextEditorWidget
@@ -86,12 +86,10 @@ class ProjectFilesEditorWidget : public TextEditor::BaseTextEditorWidget
 public:
     ProjectFilesEditorWidget(QWidget *parent, ProjectFilesFactory *factory,
                        TextEditor::TextEditorActionHandler *handler);
-    virtual ~ProjectFilesEditorWidget();
 
     ProjectFilesFactory *factory() const;
     TextEditor::TextEditorActionHandler *actionHandler() const;
-
-    virtual TextEditor::BaseTextEditor *createEditor();
+    TextEditor::BaseTextEditor *createEditor();
 
 private:
     ProjectFilesFactory *m_factory;
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.cpp b/src/plugins/genericprojectmanager/genericprojectmanager.cpp
index 0fa2846531..efe7856068 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectmanager.cpp
@@ -39,7 +39,8 @@
 
 #include <QDebug>
 
-using namespace GenericProjectManager::Internal;
+namespace GenericProjectManager {
+namespace Internal {
 
 Manager::Manager()
 { }
@@ -77,3 +78,6 @@ void Manager::unregisterProject(GenericProject *project)
 {
     m_projects.removeAll(project);
 }
+
+} // namespace Internal
+} // namespace GenericProjectManager
diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.cpp b/src/plugins/genericprojectmanager/genericprojectnodes.cpp
index 691ee1ac8b..7e0e698a8f 100644
--- a/src/plugins/genericprojectmanager/genericprojectnodes.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectnodes.cpp
@@ -36,13 +36,13 @@
 
 #include <QFileInfo>
 
-using namespace GenericProjectManager;
-using namespace GenericProjectManager::Internal;
+using namespace ProjectExplorer;
+
+namespace GenericProjectManager {
+namespace Internal {
 
 GenericProjectNode::GenericProjectNode(GenericProject *project, Core::IDocument *projectFile)
-    : ProjectExplorer::ProjectNode(projectFile->fileName()),
-      m_project(project),
-      m_projectFile(projectFile)
+    : ProjectNode(projectFile->fileName()), m_project(project), m_projectFile(projectFile)
 {
     setDisplayName(QFileInfo(projectFile->fileName()).completeBaseName());
 }
@@ -59,8 +59,6 @@ QString GenericProjectNode::projectFilePath() const
 
 void GenericProjectNode::refresh()
 {
-    using namespace ProjectExplorer;
-
     // remove the existing nodes.
     removeFileNodes(fileNodes(), this);
     removeFolderNodes(subFolderNodes(), this);
@@ -129,7 +127,7 @@ void GenericProjectNode::refresh()
     }
 }
 
-ProjectExplorer::FolderNode *GenericProjectNode::findOrCreateFolderByName
+FolderNode *GenericProjectNode::findOrCreateFolderByName
     (FolderByName *folderByName, const QStringList &components, int end)
 {
     if (!end)
@@ -167,7 +165,7 @@ bool GenericProjectNode::hasBuildTargets() const
     return true;
 }
 
-QList<ProjectExplorer::ProjectNode::ProjectAction> GenericProjectNode::supportedActions(Node *node) const
+QList<ProjectNode::ProjectAction> GenericProjectNode::supportedActions(Node *node) const
 {
     Q_UNUSED(node);
     return QList<ProjectAction>()
@@ -195,7 +193,7 @@ bool GenericProjectNode::removeSubProjects(const QStringList &proFilePaths)
     return false;
 }
 
-bool GenericProjectNode::addFiles(const ProjectExplorer::FileType fileType,
+bool GenericProjectNode::addFiles(const FileType fileType,
                                   const QStringList &filePaths, QStringList *notAdded)
 {
     Q_UNUSED(fileType)
@@ -204,7 +202,7 @@ bool GenericProjectNode::addFiles(const ProjectExplorer::FileType fileType,
     return m_project->addFiles(filePaths);
 }
 
-bool GenericProjectNode::removeFiles(const ProjectExplorer::FileType fileType,
+bool GenericProjectNode::removeFiles(const FileType fileType,
                                      const QStringList &filePaths, QStringList *notRemoved)
 {
     Q_UNUSED(fileType)
@@ -213,7 +211,7 @@ bool GenericProjectNode::removeFiles(const ProjectExplorer::FileType fileType,
     return m_project->removeFiles(filePaths);
 }
 
-bool GenericProjectNode::deleteFiles(const ProjectExplorer::FileType fileType,
+bool GenericProjectNode::deleteFiles(const FileType fileType,
                                      const QStringList &filePaths)
 {
     Q_UNUSED(fileType)
@@ -221,7 +219,7 @@ bool GenericProjectNode::deleteFiles(const ProjectExplorer::FileType fileType,
     return false;
 }
 
-bool GenericProjectNode::renameFile(const ProjectExplorer::FileType fileType,
+bool GenericProjectNode::renameFile(const FileType fileType,
                                     const QString &filePath, const QString &newFilePath)
 {
     Q_UNUSED(fileType)
@@ -229,8 +227,11 @@ bool GenericProjectNode::renameFile(const ProjectExplorer::FileType fileType,
     return m_project->renameFile(filePath, newFilePath);
 }
 
-QList<ProjectExplorer::RunConfiguration *> GenericProjectNode::runConfigurationsFor(Node *node)
+QList<RunConfiguration *> GenericProjectNode::runConfigurationsFor(Node *node)
 {
     Q_UNUSED(node)
-    return QList<ProjectExplorer::RunConfiguration *>();
+    return QList<RunConfiguration *>();
 }
+
+} // namespace Internal
+} // namespace GenericProjectManager
diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.h b/src/plugins/genericprojectmanager/genericprojectnodes.h
index 156935892d..c3422c75fd 100644
--- a/src/plugins/genericprojectmanager/genericprojectnodes.h
+++ b/src/plugins/genericprojectmanager/genericprojectnodes.h
@@ -53,30 +53,30 @@ public:
     Core::IDocument *projectFile() const;
     QString projectFilePath() const;
 
-    virtual bool hasBuildTargets() const;
+    bool hasBuildTargets() const;
 
-    virtual QList<ProjectExplorer::ProjectNode::ProjectAction> supportedActions(Node *node) const;
+    QList<ProjectExplorer::ProjectNode::ProjectAction> supportedActions(Node *node) const;
 
-    virtual bool canAddSubProject(const QString &proFilePath) const;
+    bool canAddSubProject(const QString &proFilePath) const;
 
-    virtual bool addSubProjects(const QStringList &proFilePaths);
-    virtual bool removeSubProjects(const QStringList &proFilePaths);
+    bool addSubProjects(const QStringList &proFilePaths);
+    bool removeSubProjects(const QStringList &proFilePaths);
 
-    virtual bool addFiles(const ProjectExplorer::FileType fileType,
+    bool addFiles(const ProjectExplorer::FileType fileType,
                           const QStringList &filePaths,
                           QStringList *notAdded = 0);
 
-    virtual bool removeFiles(const ProjectExplorer::FileType fileType,
+    bool removeFiles(const ProjectExplorer::FileType fileType,
                              const QStringList &filePaths,
                              QStringList *notRemoved = 0);
-    virtual bool deleteFiles(const ProjectExplorer::FileType fileType,
+    bool deleteFiles(const ProjectExplorer::FileType fileType,
                              const QStringList &filePaths);
 
-    virtual bool renameFile(const ProjectExplorer::FileType fileType,
+    bool renameFile(const ProjectExplorer::FileType fileType,
                              const QString &filePath,
                              const QString &newFilePath);
 
-    virtual QList<ProjectExplorer::RunConfiguration *> runConfigurationsFor(Node *node);
+    QList<ProjectExplorer::RunConfiguration *> runConfigurationsFor(Node *node);
 
     void refresh();
 
diff --git a/src/plugins/genericprojectmanager/genericprojectplugin.cpp b/src/plugins/genericprojectmanager/genericprojectplugin.cpp
index 0c3e5c94ae..460402bb39 100644
--- a/src/plugins/genericprojectmanager/genericprojectplugin.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectplugin.cpp
@@ -53,10 +53,8 @@
 #include <QtPlugin>
 #include <QDebug>
 
-#include <QTreeView>
-
-using namespace GenericProjectManager;
-using namespace GenericProjectManager::Internal;
+namespace GenericProjectManager {
+namespace Internal {
 
 GenericProjectPlugin::GenericProjectPlugin()
     : m_projectFilesEditorFactory(0)
@@ -96,7 +94,8 @@ bool GenericProjectPlugin::initialize(const QStringList &, QString *errorMessage
     Core::ActionContainer *mproject =
             Core::ActionManager::actionContainer(ProjectExplorer::Constants::M_PROJECTCONTEXT);
     m_editFilesAction = new QAction(tr("Edit Files..."), this);
-    Core::Command *command = Core::ActionManager::registerAction(m_editFilesAction, Constants::EDITFILESACTION, projectContext);
+
+    Core::Command *command = Core::ActionManager::registerAction(m_editFilesAction, "GenericProjectManager.EditFiles", projectContext);
     command->setAttribute(Core::Command::CA_Hide);
     mproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_FILES);
     connect(m_editFilesAction, SIGNAL(triggered()), this, SLOT(editFiles()));
@@ -126,4 +125,7 @@ void GenericProjectPlugin::editFiles()
     }
 }
 
-Q_EXPORT_PLUGIN(GenericProjectPlugin)
+} // namespace Internal
+} // namespace GenericProjectManager
+
+Q_EXPORT_PLUGIN(GenericProjectManager::Internal::GenericProjectPlugin)
diff --git a/src/plugins/genericprojectmanager/genericprojectplugin.h b/src/plugins/genericprojectmanager/genericprojectplugin.h
index 5c2e73c2bd..495836c019 100644
--- a/src/plugins/genericprojectmanager/genericprojectplugin.h
+++ b/src/plugins/genericprojectmanager/genericprojectplugin.h
@@ -55,8 +55,9 @@ public:
     GenericProjectPlugin();
     ~GenericProjectPlugin();
 
-    virtual bool initialize(const QStringList &arguments, QString *errorString);
-    virtual void extensionsInitialized();
+    bool initialize(const QStringList &arguments, QString *errorString);
+    void extensionsInitialized();
+
 private slots:
     void updateContextMenu(ProjectExplorer::Project *, ProjectExplorer::Node *);
     void editFiles();
diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
index a86eb3f007..1db7c13068 100644
--- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
@@ -38,23 +38,21 @@
 
 #include <utils/filewizardpage.h>
 
-#include <QIcon>
-
 #include <QApplication>
-#include <QStyle>
-#include <QPainter>
-#include <QPixmap>
-
+#include <QDebug>
 #include <QDir>
 #include <QFileInfo>
-#include <QDebug>
-#include <QCoreApplication>
+#include <QPainter>
+#include <QPixmap>
+#include <QStyle>
 
-using namespace GenericProjectManager::Internal;
-using namespace Utils;
+namespace GenericProjectManager {
+namespace Internal {
 
 //////////////////////////////////////////////////////////////////////////////
+//
 // GenericProjectWizardDialog
+//
 //////////////////////////////////////////////////////////////////////////////
 
 GenericProjectWizardDialog::GenericProjectWizardDialog(QWidget *parent)
@@ -63,7 +61,7 @@ GenericProjectWizardDialog::GenericProjectWizardDialog(QWidget *parent)
     setWindowTitle(tr("Import Existing Project"));
 
     // first page
-    m_firstPage = new FileWizardPage;
+    m_firstPage = new Utils::FileWizardPage;
     m_firstPage->setTitle(tr("Project Name and Location"));
     m_firstPage->setFileNameLabel(tr("Project name:"));
     m_firstPage->setPathLabel(tr("Location:"));
@@ -79,9 +77,6 @@ GenericProjectWizardDialog::GenericProjectWizardDialog(QWidget *parent)
     wizardProgress()->item(secondPageId)->setTitle(tr("Files"));
 }
 
-GenericProjectWizardDialog::~GenericProjectWizardDialog()
-{ }
-
 QString GenericProjectWizardDialog::path() const
 {
     return m_firstPage->path();
@@ -107,13 +102,16 @@ QString GenericProjectWizardDialog::projectName() const
     return m_firstPage->fileName();
 }
 
+//////////////////////////////////////////////////////////////////////////////
+//
+// GenericProjectWizard
+//
+//////////////////////////////////////////////////////////////////////////////
+
 GenericProjectWizard::GenericProjectWizard()
     : Core::BaseFileWizard(parameters())
 { }
 
-GenericProjectWizard::~GenericProjectWizard()
-{ }
-
 Core::FeatureSet GenericProjectWizard::requiredFeatures() const
 {
     return Core::FeatureSet();
@@ -217,3 +215,6 @@ bool GenericProjectWizard::postGenerateFiles(const QWizard *w, const Core::Gener
     Q_UNUSED(w);
     return ProjectExplorer::CustomProjectWizard::postGenerateOpen(l, errorMessage);
 }
+
+} // namespace Internal
+} // namespace GenericProjectManager
diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.h b/src/plugins/genericprojectmanager/genericprojectwizard.h
index f8f0ea19b8..551ade3e40 100644
--- a/src/plugins/genericprojectmanager/genericprojectwizard.h
+++ b/src/plugins/genericprojectmanager/genericprojectwizard.h
@@ -34,16 +34,7 @@
 #include <coreplugin/basefilewizard.h>
 #include <utils/wizard.h>
 
-QT_BEGIN_NAMESPACE
-class QFileInfo;
-class QDir;
-QT_END_NAMESPACE
-
-namespace Utils {
-
-class FileWizardPage;
-
-} // namespace Utils
+namespace Utils { class FileWizardPage; }
 
 namespace GenericProjectManager {
 namespace Internal {
@@ -56,7 +47,6 @@ class GenericProjectWizardDialog : public Utils::Wizard
 
 public:
     GenericProjectWizardDialog(QWidget *parent = 0);
-    virtual ~GenericProjectWizardDialog();
 
     QString path() const;
     void setPath(const QString &path);
@@ -75,19 +65,15 @@ class GenericProjectWizard : public Core::BaseFileWizard
 
 public:
     GenericProjectWizard();
-    virtual ~GenericProjectWizard();
-    virtual Core::FeatureSet requiredFeatures() const;
+    Core::FeatureSet requiredFeatures() const;
 
     static Core::BaseFileWizardParameters parameters();
 
 protected:
-    virtual QWizard *createWizardDialog(QWidget *parent,
-                                        const Core::WizardDialogParameters &wizardDialogParameters) const;
-
-    virtual Core::GeneratedFiles generateFiles(const QWizard *w,
-                                               QString *errorMessage) const;
-
-    virtual bool postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage);
+    QWizard *createWizardDialog(QWidget *parent,
+                                const Core::WizardDialogParameters &wizardDialogParameters) const;
+    Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
+    bool postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage);
 };
 
 } // namespace Internal
diff --git a/src/plugins/genericprojectmanager/pkgconfigtool.cpp b/src/plugins/genericprojectmanager/pkgconfigtool.cpp
index 54243d5a34..d1dffffb62 100644
--- a/src/plugins/genericprojectmanager/pkgconfigtool.cpp
+++ b/src/plugins/genericprojectmanager/pkgconfigtool.cpp
@@ -34,18 +34,12 @@
 #include <QTextStream>
 #include <QDebug>
 
-using namespace GenericProjectManager::Internal;
-
-PkgConfigTool::PkgConfigTool()
-{ }
-
-PkgConfigTool::~PkgConfigTool()
-{ }
+namespace GenericProjectManager {
+namespace Internal {
 
 QList<PkgConfigTool::Package> PkgConfigTool::packages() const
 {
     if (m_packages.isEmpty())
-        packages_helper();
 
     return m_packages;
 }
@@ -128,3 +122,6 @@ void PkgConfigTool::packages_helper() const
         m_packages.append(package);
     }
 }
+
+} // namespace Internal
+} // namespace GenericProjectManager
diff --git a/src/plugins/genericprojectmanager/pkgconfigtool.h b/src/plugins/genericprojectmanager/pkgconfigtool.h
index 5272ce4694..b11edea2a6 100644
--- a/src/plugins/genericprojectmanager/pkgconfigtool.h
+++ b/src/plugins/genericprojectmanager/pkgconfigtool.h
@@ -50,16 +50,12 @@ public:
         QStringList undefines;
     };
 
-public:
-    PkgConfigTool();
-    virtual ~PkgConfigTool();
+    PkgConfigTool() {}
 
     QList<Package> packages() const;
 
 private:
     void packages_helper() const;
-
-private:
     mutable QList<Package> m_packages;
 };
 
diff --git a/src/plugins/genericprojectmanager/selectablefilesmodel.cpp b/src/plugins/genericprojectmanager/selectablefilesmodel.cpp
index 83d2c50fff..434634a3aa 100644
--- a/src/plugins/genericprojectmanager/selectablefilesmodel.cpp
+++ b/src/plugins/genericprojectmanager/selectablefilesmodel.cpp
@@ -35,14 +35,15 @@
 #include <coreplugin/icore.h>
 
 #include <utils/QtConcurrentTools>
-#include <QHBoxLayout>
+
 #include <QDialogButtonBox>
-#include <QTreeView>
+#include <QHBoxLayout>
 #include <QLineEdit>
 #include <QPushButton>
+#include <QTreeView>
 
-using namespace GenericProjectManager;
-using namespace GenericProjectManager::Internal;
+namespace GenericProjectManager {
+namespace Internal {
 
 SelectableFilesModel::SelectableFilesModel(const QString &baseDir, QObject *parent)
     : QAbstractItemModel(parent), m_root(0), m_baseDir(baseDir), m_allFiles(true)
@@ -613,3 +614,6 @@ void SelectableFilesDialog::applyFilter()
     Core::ICore::settings()->setValue(Constants::FILEFILTER_SETTING, filter);
     m_selectableFilesModel->applyFilter(filter);
 }
+
+} // namespace Internal
+} // namespace GenericProjectManager
diff --git a/src/plugins/genericprojectmanager/selectablefilesmodel.h b/src/plugins/genericprojectmanager/selectablefilesmodel.h
index 2c191db719..75957b9424 100644
--- a/src/plugins/genericprojectmanager/selectablefilesmodel.h
+++ b/src/plugins/genericprojectmanager/selectablefilesmodel.h
@@ -43,7 +43,6 @@
 namespace GenericProjectManager {
 namespace Internal {
 
-
 struct Tree
 {
     QString name;
@@ -68,6 +67,7 @@ struct Glob
 class SelectableFilesModel : public QAbstractItemModel
 {
     Q_OBJECT
+
 public:
     SelectableFilesModel(const QString &baseDir, QObject *parent);
     ~SelectableFilesModel();
@@ -92,11 +92,14 @@ public:
     void waitForFinished();
     void cancel();
     void applyFilter(const QString &filter);
+
 signals:
     void parsingFinished();
     void parsingProgress(const QString &filename);
+
 private slots:
     void buildTreeFinished();
+
 private:
     QList<Glob> parseFilter(const QString &filter);
     Qt::CheckState applyFilter(const QModelIndex &index);
@@ -124,6 +127,7 @@ private:
 class SelectableFilesDialog : public QDialog
 {
     Q_OBJECT
+
 public:
     SelectableFilesDialog(const QString &path, const QStringList files, QWidget *parent);
     ~SelectableFilesDialog();
@@ -145,8 +149,7 @@ private:
     QLabel *m_progressLabel;
 };
 
-}
-}
-
+} // namespace Internal
+} // namespace GenericProjectManager
 
 #endif // SELECTABLEFILESMODEL_H