feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Class name simplification for MakeStep related classes

Browse Source 
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.
This commit is contained in:
Thorbjørn Lindeijer
2009-03-18 13:33:00 +01:00
parent 93b3dda602
commit 3904b2ad3e
10 changed files with 85 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -29,17 +29,15 @@
#include "genericproject.h"
#include "genericprojectconstants.h"
#include "genericprojectnodes.h"
#include "makestep.h"
#include "genericmakestep.h"
#include <projectexplorer/projectexplorerconstants.h>
#include <cpptools/cppmodelmanagerinterface.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/pathchooser.h>
#include <utils/qtcassert.h>
#include <coreplugin/icore.h>
#include <cpptools/cppmodelmanagerinterface.h>
#include <QtCore/QtDebug>
#include <QtCore/QDir>
#include <QtCore/QSettings>
@@ -55,10 +53,6 @@
using namespace GenericProjectManager;
using namespace GenericProjectManager::Internal;
////////////////////////////////////////////////////////////////////////////////////
// GenericProject
////////////////////////////////////////////////////////////////////////////////////
namespace {
class ListModel: public QStringListModel
@@ -104,6 +98,10 @@ public:
} // end of anonymous namespace
////////////////////////////////////////////////////////////////////////////////////
// GenericProject
////////////////////////////////////////////////////////////////////////////////////
GenericProject::GenericProject(Manager *manager, const QString &fileName)
: m_manager(manager),
m_fileName(fileName),
@@ -401,10 +399,10 @@ QStringList GenericProject::targets() const
return targets;
}
MakeStep *GenericProject::makeStep() const
GenericMakeStep *GenericProject::makeStep() const
{
foreach (ProjectExplorer::BuildStep *bs, buildSteps()) {
if (MakeStep *ms = qobject_cast<MakeStep *>(bs))
if (GenericMakeStep *ms = qobject_cast<GenericMakeStep *>(bs))
return ms;
}
@@ -416,7 +414,7 @@ void GenericProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsRead
Project::restoreSettingsImpl(reader);
if (buildConfigurations().isEmpty()) {
MakeStep *makeStep = new MakeStep(this);
GenericMakeStep *makeStep = new GenericMakeStep(this);
insertBuildStep(0, makeStep);
const QLatin1String all("all");
@@ -457,6 +455,7 @@ void GenericProject::saveSettingsImpl(ProjectExplorer::PersistentSettingsWriter
////////////////////////////////////////////////////////////////////////////////////
// GenericBuildSettingsWidget
////////////////////////////////////////////////////////////////////////////////////
GenericBuildSettingsWidget::GenericBuildSettingsWidget(GenericProject *project)
: m_project(project)
{
@@ -496,6 +495,7 @@ void GenericBuildSettingsWidget::buildDirectoryChanged()
////////////////////////////////////////////////////////////////////////////////////
// GenericProjectFile
////////////////////////////////////////////////////////////////////////////////////
GenericProjectFile::GenericProjectFile(GenericProject *parent, QString fileName)
: Core::IFile(parent),
m_project(parent),