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

@@ -55,7 +55,7 @@ Core::GeneratedFiles FormWizard::generateFiles(const QWizard *w,
QString *errorMessage) const
{
const FormFileWizardDialog *wizard = qobject_cast<const FormFileWizardDialog *>(w);
const QString fileName = Core::BaseFileWizard::buildFileName(wizard->path(), wizard->name(),
const QString fileName = Core::BaseFileWizard::buildFileName(wizard->path(), wizard->fileName(),
preferredSuffix(QLatin1String(Constants::FORM_MIMETYPE)));
const QString formTemplate = wizard->templateContents();
@@ -66,6 +66,6 @@ Core::GeneratedFiles FormWizard::generateFiles(const QWizard *w,
Core::GeneratedFile file(fileName);
file.setContents(formTemplate);
file.setEditorKind(QLatin1String(Constants::C_FORMEDITOR));
file.setEditorId(QLatin1String(Constants::C_FORMEDITOR_ID));
return Core::GeneratedFiles() << file;
}