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

3 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/welcome/welcomemode.cpp b/src/plugins/welcome/welcomemode.cpp
index 6397930cfa..4ebefd396a 100644
--- a/src/plugins/welcome/welcomemode.cpp
+++ b/src/plugins/welcome/welcomemode.cpp
@@ -111,7 +111,7 @@ WelcomeMode::~WelcomeMode()
     delete m_d;
 }
 
-QString WelcomeMode::name() const
+QString WelcomeMode::displayName() const
 {
     return tr("Welcome");
 }
@@ -131,9 +131,9 @@ QWidget* WelcomeMode::widget()
     return m_d->m_scrollArea;
 }
 
-const char* WelcomeMode::uniqueModeName() const
+QString WelcomeMode::id() const
 {
-    return Core::Constants::MODE_WELCOME;
+    return QLatin1String(Core::Constants::MODE_WELCOME);
 }
 
 QList<int> WelcomeMode::context() const
diff --git a/src/plugins/welcome/welcomemode.h b/src/plugins/welcome/welcomemode.h
index eee3f687bf..1cae434e23 100644
--- a/src/plugins/welcome/welcomemode.h
+++ b/src/plugins/welcome/welcomemode.h
@@ -53,11 +53,11 @@ public:
     ~WelcomeMode();
 
     // IMode
-    QString name() const;
+    QString displayName() const;
     QIcon icon() const;
     int priority() const;
     QWidget *widget();
-    const char *uniqueModeName() const;
+    QString id() const;
     QList<int> context() const;
     void activated();
     QString contextHelpId() const { return QLatin1String("Qt Creator"); }
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index 83c9da7dbb..bdfa890cd4 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -100,7 +100,7 @@ bool WelcomePlugin::initialize(const QStringList &arguments, QString *error_mess
 void WelcomePlugin::extensionsInitialized()
 {
     m_welcomeMode->initPlugins();
-    Core::ModeManager::instance()->activateMode(m_welcomeMode->uniqueModeName());
+    Core::ModeManager::instance()->activateMode(m_welcomeMode->id());
 }
 
 Q_EXPORT_PLUGIN(WelcomePlugin)