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

src/plugins/git/clonewizard.cpp

@@ -55,7 +55,7 @@ QString CloneWizard::description() const
     return tr("Clones a project from a git repository.");
 }
 
-QString CloneWizard::name() const
+QString CloneWizard::displayName() const
 {
     return tr("Git Repository Clone");
 }

src/plugins/git/clonewizard.h

@@ -44,7 +44,7 @@ public:
     // IWizard
     virtual QIcon icon() const;
     virtual QString description() const;
-    virtual QString name() const;
+    virtual QString displayName() const;
 
 protected:
     // BaseCheckoutWizard

src/plugins/git/giteditor.cpp

@@ -67,7 +67,7 @@ GitEditor::GitEditor(const VCSBase::VCSBaseEditorParameters *type,
     QTC_ASSERT(m_changeNumberPattern40.isValid(), return);
     setAnnotateRevisionTextFormat(tr("Blame %1"));
     if (Git::Constants::debug)
-        qDebug() << "GitEditor::GitEditor" << type->type << type->kind;
+        qDebug() << "GitEditor::GitEditor" << type->type << type->id;
 }
 
 QSet<QString> GitEditor::annotationChanges() const

src/plugins/git/gitorious/gitoriousclonewizard.cpp

@@ -83,7 +83,7 @@ QString GitoriousCloneWizard::description() const
     return tr("Clones a project from a Gitorious repository.");
 }
 
-QString GitoriousCloneWizard::name() const
+QString GitoriousCloneWizard::displayName() const
 {
     return tr("Gitorious Repository Clone");
 }

src/plugins/git/gitorious/gitoriousclonewizard.h

@@ -46,7 +46,7 @@ public:
     // IWizard
     virtual QIcon icon() const;
     virtual QString description() const;
-    virtual QString name() const;
+    virtual QString displayName() const;
 
 protected:
     // BaseCheckoutWizard

src/plugins/git/gitversioncontrol.cpp

@@ -39,7 +39,7 @@ GitVersionControl::GitVersionControl(GitClient *client) :
 {
 }
 
-QString GitVersionControl::name() const
+QString GitVersionControl::displayName() const
 {
     return QLatin1String("git");
 }

src/plugins/git/gitversioncontrol.h

@@ -44,7 +44,7 @@ class GitVersionControl : public Core::IVersionControl
 public:
     explicit GitVersionControl(GitClient *plugin);
 
-    virtual QString name() const;
+    virtual QString displayName() const;
 
     bool managesDirectory(const QString &directory) const;
     virtual QString findTopLevelForDirectory(const QString &directory) const;

src/plugins/git/settingspage.cpp

@@ -102,7 +102,7 @@ QString SettingsPage::id() const
     return QLatin1String(VCSBase::Constants::VCS_ID_GIT);
 }
 
-QString SettingsPage::trName() const
+QString SettingsPage::displayName() const
 {
     return tr("Git");
 }
@@ -112,7 +112,7 @@ QString SettingsPage::category() const
     return QLatin1String(VCSBase::Constants::VCS_SETTINGS_CATEGORY);
 }
 
-QString SettingsPage::trCategory() const
+QString SettingsPage::displayCategory() const
 {
     return QCoreApplication::translate("VCSBase", VCSBase::Constants::VCS_SETTINGS_TR_CATEGORY);
 }

src/plugins/git/settingspage.h

@@ -71,9 +71,9 @@ public:
     SettingsPage();
 
     QString id() const;
-    QString trName() const;
+    QString displayName() const;
     QString category() const;
-    QString trCategory() const;
+    QString displayCategory() const;
 
     QWidget *createPage(QWidget *parent);
     void apply();