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

Make method naming more consistent.

Browse Source 
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
This commit is contained in:
Tobias Hunger
2010-01-07 18:17:24 +01:00
parent 8bb87fcda4
commit a6ad773722
332 changed files with 1666 additions and 1543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/projectexplorer/project.cpp
View File

@@ -158,7 +158,7 @@ void Project::saveSettingsImpl(PersistentSettingsWriter &writer)
for(int i=0; i < bcs.size(); ++i) {
QStringList buildStepNames;
foreach (BuildStep *buildStep, bcs.at(i)->buildSteps())
buildStepNames << buildStep->name();
buildStepNames << buildStep->displayName();
writer.saveValue("buildconfiguration-" + QString::number(i) + "-buildsteps", buildStepNames);
int buildstepnr = 0;
@@ -174,7 +174,7 @@ void Project::saveSettingsImpl(PersistentSettingsWriter &writer)
for(int i=0; i < bcs.size(); ++i) {
QStringList cleanStepNames;
foreach (BuildStep *cleanStep, bcs.at(i)->cleanSteps())
cleanStepNames << cleanStep->name();
cleanStepNames << cleanStep->displayName();
writer.saveValue("buildconfiguration-" + QString::number(i) + "-cleansteps", cleanStepNames);
int cleanstepnr = 0;
@@ -191,7 +191,7 @@ void Project::saveSettingsImpl(PersistentSettingsWriter &writer)
int activeId = 0;
foreach (RunConfiguration* rc, m_runConfigurations) {
writer.setPrefix("RunConfiguration" + QString().setNum(i) + "-");
writer.saveValue("type", rc->type());
writer.saveValue("Id", rc->id());
rc->save(writer);
if (rc == m_activeRunConfiguration)
activeId = i;
@@ -358,13 +358,13 @@ bool Project::restoreSettingsImpl(PersistentSettingsReader &reader)
ExtensionSystem::PluginManager::instance()->getObjects<IRunConfigurationFactory>();
forever {
reader.setPrefix("RunConfiguration" + QString().setNum(i) + "-");
const QVariant &typeVariant = reader.restoreValue("type");
if (!typeVariant.isValid())
const QVariant &idVariant = reader.restoreValue("Id");
if (!idVariant.isValid())
break;
const QString &type = typeVariant.toString();
const QString &id = idVariant.toString();
foreach (IRunConfigurationFactory *factory, factories) {
if (factory->canRestore(type)) {
RunConfiguration* rc = factory->create(this, type);
if (factory->canRestore(id)) {
RunConfiguration* rc = factory->create(this, id);
rc->restore(reader);
addRunConfiguration(rc);
if (i == activeId)
@@ -405,17 +405,17 @@ QList<RunConfiguration *> Project::runConfigurations() const
void Project::addRunConfiguration(RunConfiguration* runConfiguration)
{
if (m_runConfigurations.contains(runConfiguration)) {
qWarning()<<"Not adding already existing runConfiguration"<<runConfiguration->name();
qWarning()<<"Not adding already existing runConfiguration"<<runConfiguration->displayName();
return;
}
m_runConfigurations.push_back(runConfiguration);
emit addedRunConfiguration(this, runConfiguration->name());
emit addedRunConfiguration(this, runConfiguration->displayName());
}
void Project::removeRunConfiguration(RunConfiguration* runConfiguration)
{
if(!m_runConfigurations.contains(runConfiguration)) {
qWarning()<<"Not removing runConfiguration"<<runConfiguration->name()<<"becasue it doesn't exist";
qWarning()<<"Not removing runConfiguration"<<runConfiguration->displayName()<<"becasue it doesn't exist";
return;
}
@@ -429,7 +429,7 @@ void Project::removeRunConfiguration(RunConfiguration* runConfiguration)
}
m_runConfigurations.removeOne(runConfiguration);
emit removedRunConfiguration(this, runConfiguration->name());
emit removedRunConfiguration(this, runConfiguration->displayName());
delete runConfiguration;
}