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

7 files changed, 11 insertions, 11 deletions

diff --git a/src/plugins/cvs/checkoutwizard.cpp b/src/plugins/cvs/checkoutwizard.cpp
index 09ab77febe4..a08a315938d 100644
--- a/src/plugins/cvs/checkoutwizard.cpp
+++ b/src/plugins/cvs/checkoutwizard.cpp
@@ -56,7 +56,7 @@ QString CheckoutWizard::description() const
     return tr("Checks out a project from a CVS repository.");
 }
 
-QString CheckoutWizard::name() const
+QString CheckoutWizard::displayName() const
 {
     return tr("CVS Checkout");
 }
diff --git a/src/plugins/cvs/checkoutwizard.h b/src/plugins/cvs/checkoutwizard.h
index d0f98570ea3..44c45a423e2 100644
--- a/src/plugins/cvs/checkoutwizard.h
+++ b/src/plugins/cvs/checkoutwizard.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
diff --git a/src/plugins/cvs/cvscontrol.cpp b/src/plugins/cvs/cvscontrol.cpp
index d4c3c5b4529..f633e4c7afd 100644
--- a/src/plugins/cvs/cvscontrol.cpp
+++ b/src/plugins/cvs/cvscontrol.cpp
@@ -41,7 +41,7 @@ CVSControl::CVSControl(CVSPlugin *plugin) :
 {
 }
 
-QString CVSControl::name() const
+QString CVSControl::displayName() const
 {
     return QLatin1String("cvs");
 }
diff --git a/src/plugins/cvs/cvscontrol.h b/src/plugins/cvs/cvscontrol.h
index 0234d16b957..e89a292408e 100644
--- a/src/plugins/cvs/cvscontrol.h
+++ b/src/plugins/cvs/cvscontrol.h
@@ -43,7 +43,7 @@ class CVSControl : public Core::IVersionControl
     Q_OBJECT
 public:
     explicit CVSControl(CVSPlugin *plugin);
-    virtual QString name() const;
+    virtual QString displayName() const;
 
     virtual bool managesDirectory(const QString &directory) const;
     virtual QString findTopLevelForDirectory(const QString &directory) const;
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index 3f3ed34d596..4a1bd30d70b 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -1022,11 +1022,11 @@ Core::IEditor * CVSPlugin::showOutputInEditor(const QString& title, const QStrin
 {
     const VCSBase::VCSBaseEditorParameters *params = findType(editorType);
     QTC_ASSERT(params, return 0);
-    const QString kind = QLatin1String(params->kind);
+    const QString id = params->id;
     if (CVS::Constants::debug)
-        qDebug() << "CVSPlugin::showOutputInEditor" << title << kind <<  "source=" << source << "Size= " << output.size() <<  " Type=" << editorType << debugCodec(codec);
+        qDebug() << "CVSPlugin::showOutputInEditor" << title << id <<  "source=" << source << "Size= " << output.size() <<  " Type=" << editorType << debugCodec(codec);
     QString s = title;
-    Core::IEditor *editor = Core::EditorManager::instance()->openEditorWithContents(kind, &s, output.toLocal8Bit());
+    Core::IEditor *editor = Core::EditorManager::instance()->openEditorWithContents(id, &s, output.toLocal8Bit());
     connect(editor, SIGNAL(annotateRevisionRequested(QString,QString,int)),
             this, SLOT(annotateVersion(QString,QString,int)));
     CVSEditor *e = qobject_cast<CVSEditor*>(editor->widget());
diff --git a/src/plugins/cvs/settingspage.cpp b/src/plugins/cvs/settingspage.cpp
index ba48750d8f1..f0dd40ec23a 100644
--- a/src/plugins/cvs/settingspage.cpp
+++ b/src/plugins/cvs/settingspage.cpp
@@ -93,7 +93,7 @@ QString SettingsPage::id() const
     return QLatin1String(VCSBase::Constants::VCS_ID_CVS);
 }
 
-QString SettingsPage::trName() const
+QString SettingsPage::displayName() const
 {
     return tr("CVS");
 }
@@ -103,7 +103,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);
 }
diff --git a/src/plugins/cvs/settingspage.h b/src/plugins/cvs/settingspage.h
index cd80d85102c..43053725e08 100644
--- a/src/plugins/cvs/settingspage.h
+++ b/src/plugins/cvs/settingspage.h
@@ -70,9 +70,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();