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, 2 insertions, 2 deletions

diff --git a/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp
index 266abb5a33..e84fcd27f8 100644
--- a/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp
@@ -69,7 +69,7 @@ TestWizardDialog::TestWizardDialog(const QString &templateName,
 void TestWizardDialog::slotCurrentIdChanged(int id)
 {
     if (id == TestPageId)
-        m_testPage->setProjectName(name());
+        m_testPage->setProjectName(projectName());
 }
 
 TestWizardParameters TestWizardDialog::testParameters() const
@@ -81,7 +81,7 @@ QtProjectParameters TestWizardDialog::projectParameters() const
 {
     QtProjectParameters rc;
     rc.type = QtProjectParameters::ConsoleApp;
-    rc.name = name();
+    rc.fileName = projectName();
     rc.path = path();
     // Name binary "tst_xx" after the main source
     rc.target = QFileInfo(m_testPage->sourcefileName()).baseName();