Make method naming more consistent.

* 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

View File

@@ -28,6 +28,7 @@
**************************************************************************/
#include "runconfiguration.h"
#include "project.h"
#include "persistentsettings.h"
#include "buildconfiguration.h"
@@ -38,8 +39,6 @@
#include <Carbon/Carbon.h>
#endif
#include <QtDebug>
using namespace ProjectExplorer;
// RunConfiguration
@@ -67,27 +66,27 @@ bool RunConfiguration::isEnabled() const
return isEnabled(m_project->activeBuildConfiguration());
}
QString RunConfiguration::name() const
QString RunConfiguration::displayName() const
{
return m_name;
return m_displayName;
}
void RunConfiguration::setName(const QString &name)
void RunConfiguration::setDisplayName(const QString &name)
{
m_name = name;
emit nameChanged();
m_displayName = name;
emit displayNameChanged();
}
void RunConfiguration::save(PersistentSettingsWriter &writer) const
{
writer.saveValue("RunConfiguration.name", m_name);
writer.saveValue("RunConfiguration.name", m_displayName);
}
void RunConfiguration::restore(const PersistentSettingsReader &reader)
{
QVariant var = reader.restoreValue("RunConfiguration.name");
if (var.isValid() && !var.toString().isEmpty())
m_name = var.toString();
m_displayName = var.toString();
}
@@ -113,7 +112,7 @@ RunControl::RunControl(RunConfiguration *runConfiguration)
: m_runConfiguration(runConfiguration)
{
if (runConfiguration)
m_displayName = runConfiguration->name();
m_displayName = runConfiguration->displayName();
}
RunControl::~RunControl()