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

@@ -42,7 +42,7 @@ struct BaseProjectWizardDialogPrivate {
explicit BaseProjectWizardDialogPrivate(Utils::ProjectIntroPage *page, int id = -1);
const int introId;
Utils::ProjectIntroPage *introPage;
Utils::ProjectIntroPage *introPage;
};
BaseProjectWizardDialogPrivate::BaseProjectWizardDialogPrivate(Utils::ProjectIntroPage *page, int id) :
@@ -79,9 +79,9 @@ BaseProjectWizardDialog::~BaseProjectWizardDialog()
delete d;
}
QString BaseProjectWizardDialog::name() const
QString BaseProjectWizardDialog::projectName() const
{
return d->introPage->name();
return d->introPage->projectName();
}
QString BaseProjectWizardDialog::path() const
@@ -99,9 +99,9 @@ void BaseProjectWizardDialog::setPath(const QString &path)
d->introPage->setPath(path);
}
void BaseProjectWizardDialog::setName(const QString &name)
void BaseProjectWizardDialog::setProjectName(const QString &name)
{
d->introPage->setName(name);
d->introPage->setProjectName(name);
}
void BaseProjectWizardDialog::slotAccepted()
@@ -118,7 +118,7 @@ Utils::ProjectIntroPage *BaseProjectWizardDialog::introPage() const
return d->introPage;
}
QString BaseProjectWizardDialog::projectName(const QString &path)
QString BaseProjectWizardDialog::uniqueProjectName(const QString &path)
{
const QDir pathDir(path);
const QString prefix = tr("untitled");