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/projectexplorer/baseprojectwizarddialog.h b/src/plugins/projectexplorer/baseprojectwizarddialog.h
index 9f0eb94b17..fd84401d1d 100644
--- a/src/plugins/projectexplorer/baseprojectwizarddialog.h
+++ b/src/plugins/projectexplorer/baseprojectwizarddialog.h
@@ -59,16 +59,16 @@ protected:
 public:
     virtual ~BaseProjectWizardDialog();
 
-    QString name() const;
+    QString projectName() const;
     QString path() const;
 
     // Generate a new project name (untitled<n>) in path.
-    static QString projectName(const QString &path);
+    static QString uniqueProjectName(const QString &path);
 
 public slots:
     void setIntroDescription(const QString &d);
     void setPath(const QString &path);
-    void setName(const QString &name);
+    void setProjectName(const QString &name);
 
 protected:
     Utils::ProjectIntroPage *introPage() const;