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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/qt4projectmanager/wizards/testwizard.cpp b/src/plugins/qt4projectmanager/wizards/testwizard.cpp
index 2257daa01b..5c1a0fe96d 100644
--- a/src/plugins/qt4projectmanager/wizards/testwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/testwizard.cpp
@@ -53,9 +53,9 @@ QWizard *TestWizard::createWizardDialog(QWidget *parent,
                                         const QString &defaultPath,
                                         const WizardPageList &extensionPages) const
 {
-    TestWizardDialog *dialog = new TestWizardDialog(name(), icon(), extensionPages, parent);
+    TestWizardDialog *dialog = new TestWizardDialog(displayName(), icon(), extensionPages, parent);
     dialog->setPath(defaultPath);
-    dialog->setName(TestWizardDialog::projectName(defaultPath));
+    dialog->setProjectName(TestWizardDialog::uniqueProjectName(defaultPath));
     return dialog;
 }
 
@@ -160,7 +160,7 @@ Core::GeneratedFiles TestWizard::generateFiles(const QWizard *w, QString *errorM
     source.setContents(generateTestCode(testParams, sourceFileInfo.baseName()));
 
     // Create profile with define for base dir to find test data
-    const QString profileName = Core::BaseFileWizard::buildFileName(projectPath, projectParams.name, profileSuffix());
+    const QString profileName = Core::BaseFileWizard::buildFileName(projectPath, projectParams.fileName, profileSuffix());
     Core::GeneratedFile profile(profileName);
     QString contents;
     {