Class name simplification for MakeStep related classes

Was a bit confusing that a MakeStep was constructed by a
MakeBuildStepFactory and configured by a MakeBuildStepConfigWidget.

The MakeStep of the generic project manager was renamed to
GenericMakeStep.

src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp

@@ -57,7 +57,7 @@ bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString *
     CMakeSettingsPage *cmp = new CMakeSettingsPage();
     addAutoReleasedObject(cmp);
     addAutoReleasedObject(new CMakeManager(cmp));
-    addAutoReleasedObject(new MakeBuildStepFactory());
+    addAutoReleasedObject(new MakeStepFactory());
     addAutoReleasedObject(new CMakeRunConfigurationFactory());
     return true;
 }

src/plugins/cmakeprojectmanager/makestep.cpp

@@ -30,9 +30,10 @@
 #include "makestep.h"
 #include "cmakeprojectconstants.h"
 #include "cmakeproject.h"
-#include <extensionsystem/pluginmanager.h>
 
+#include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
+
 #include <QtGui/QFormLayout>
 #include <QtGui/QGroupBox>
 #include <QtGui/QCheckBox>
@@ -43,7 +44,6 @@ namespace {
 bool debug = false;
 }
 
-
 using namespace CMakeProjectManager;
 using namespace CMakeProjectManager::Internal;
 
@@ -122,7 +122,7 @@ QString MakeStep::displayName()
 
 ProjectExplorer::BuildStepConfigWidget *MakeStep::createConfigWidget()
 {
-    return new MakeBuildStepConfigWidget(this);
+    return new MakeStepConfigWidget(this);
 }
 
 bool MakeStep::immutable() const
@@ -233,10 +233,10 @@ void MakeStep::setAdditionalArguments(const QString &buildConfiguration, const Q
 }
 
 //
-// CMakeBuildStepConfigWidget
+// MakeStepConfigWidget
 //
 
-MakeBuildStepConfigWidget::MakeBuildStepConfigWidget(MakeStep *makeStep)
+MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
     : m_makeStep(makeStep)
 {
     QFormLayout *fl = new QFormLayout(this);
@@ -261,22 +261,22 @@ MakeBuildStepConfigWidget::MakeBuildStepConfigWidget(MakeStep *makeStep)
     connect(m_targetsList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*)));
 }
 
-void MakeBuildStepConfigWidget::additionalArgumentsEdited()
+void MakeStepConfigWidget::additionalArgumentsEdited()
 {
     m_makeStep->setAdditionalArguments(m_buildConfiguration, ProjectExplorer::Environment::parseCombinedArgString(m_additionalArguments->text()));
 }
 
-void MakeBuildStepConfigWidget::itemChanged(QListWidgetItem *item)
+void MakeStepConfigWidget::itemChanged(QListWidgetItem *item)
 {
     m_makeStep->setBuildTarget(m_buildConfiguration, item->text(), item->checkState() & Qt::Checked);
 }
 
-QString MakeBuildStepConfigWidget::displayName() const
+QString MakeStepConfigWidget::displayName() const
 {
     return "Make";
 }
 
-void MakeBuildStepConfigWidget::init(const QString &buildConfiguration)
+void MakeStepConfigWidget::init(const QString &buildConfiguration)
 {
     // disconnect to make the changes to the items
     disconnect(m_targetsList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*)));
@@ -293,15 +293,15 @@ void MakeBuildStepConfigWidget::init(const QString &buildConfiguration)
 }
 
 //
-// MakeBuildStepFactory
+// MakeStepFactory
 //
 
-bool MakeBuildStepFactory::canCreate(const QString &name) const
+bool MakeStepFactory::canCreate(const QString &name) const
 {
     return (Constants::MAKESTEP == name);
 }
 
-ProjectExplorer::BuildStep *MakeBuildStepFactory::create(ProjectExplorer::Project *project, const QString &name) const
+ProjectExplorer::BuildStep *MakeStepFactory::create(ProjectExplorer::Project *project, const QString &name) const
 {
     Q_ASSERT(name == Constants::MAKESTEP);
     CMakeProject *pro = qobject_cast<CMakeProject *>(project);
@@ -309,12 +309,12 @@ ProjectExplorer::BuildStep *MakeBuildStepFactory::create(ProjectExplorer::Projec
     return new MakeStep(pro);
 }
 
-QStringList MakeBuildStepFactory::canCreateForProject(ProjectExplorer::Project * /* pro */) const
+QStringList MakeStepFactory::canCreateForProject(ProjectExplorer::Project * /* pro */) const
 {
     return QStringList();
 }
 
-QString MakeBuildStepFactory::displayNameForName(const QString & /* name */) const
+QString MakeStepFactory::displayNameForName(const QString & /* name */) const
 {
     return "Make";
 }

src/plugins/cmakeprojectmanager/makestep.h

@@ -75,11 +75,11 @@ private:
     QSet<QString> m_openDirectories;
 };
 
-class MakeBuildStepConfigWidget :public ProjectExplorer::BuildStepConfigWidget
+class MakeStepConfigWidget :public ProjectExplorer::BuildStepConfigWidget
 {
     Q_OBJECT
 public:
-    MakeBuildStepConfigWidget(MakeStep *makeStep);
+    MakeStepConfigWidget(MakeStep *makeStep);
     virtual QString displayName() const;
     virtual void init(const QString &buildConfiguration);
 private slots:
@@ -87,12 +87,12 @@ private slots:
     void additionalArgumentsEdited();
 private:
     QString m_buildConfiguration;
-    MakeStep * m_makeStep;
+    MakeStep *m_makeStep;
     QListWidget *m_targetsList;
     QLineEdit *m_additionalArguments;
 };
 
-class MakeBuildStepFactory : public ProjectExplorer::IBuildStepFactory
+class MakeStepFactory : public ProjectExplorer::IBuildStepFactory
 {
     virtual bool canCreate(const QString &name) const;
     virtual ProjectExplorer::BuildStep *create(ProjectExplorer::Project *pro, const QString &name) const;
@@ -100,7 +100,7 @@ class MakeBuildStepFactory : public ProjectExplorer::IBuildStepFactory
     virtual QString displayNameForName(const QString &name) const;
 };
 
-}
-}
+} // namespace Internal
+} // namespace CMakeProjectManager
 
 #endif // MAKESTEP_H