9 files changed, 18 insertions, 18 deletions
diff --git a/src/plugins/help/docsettingspage.cpp b/src/plugins/help/docsettingspage.cpp
index b5d82de9793..7a911e3e5da 100644
--- a/src/plugins/help/docsettingspage.cpp
+++ b/src/plugins/help/docsettingspage.cpp
@@ -48,7 +48,7 @@ QString DocSettingsPage::id() const
     return QLatin1String("B.Documentation");
 }
 
-QString DocSettingsPage::trName() const
+QString DocSettingsPage::displayName() const
 {
     return tr("Documentation");
 }
@@ -58,7 +58,7 @@ QString DocSettingsPage::category() const
     return QLatin1String(Help::Constants::HELP_CATEGORY);
 }
 
-QString DocSettingsPage::trCategory() const
+QString DocSettingsPage::displayCategory() const
 {
     return QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY);
 }
diff --git a/src/plugins/help/docsettingspage.h b/src/plugins/help/docsettingspage.h
index 1a620036fca..d744faf0c17 100644
--- a/src/plugins/help/docsettingspage.h
+++ b/src/plugins/help/docsettingspage.h
@@ -49,9 +49,9 @@ public:
     DocSettingsPage(QHelpEngine *helpEngine);
 
     QString id() const;
-    QString trName() const;
+    QString displayName() const;
     QString category() const;
-    QString trCategory() const;
+    QString displayCategory() const;
 
     QWidget *createPage(QWidget *parent);
     void apply();
diff --git a/src/plugins/help/filtersettingspage.cpp b/src/plugins/help/filtersettingspage.cpp
index fd69f92b8b8..fef6ad7acd7 100644
--- a/src/plugins/help/filtersettingspage.cpp
+++ b/src/plugins/help/filtersettingspage.cpp
@@ -49,7 +49,7 @@ QString FilterSettingsPage::id() const
     return QLatin1String("D.Filters");
 }
 
-QString FilterSettingsPage::trName() const
+QString FilterSettingsPage::displayName() const
 {
     return tr("Filters");
 }
@@ -59,7 +59,7 @@ QString FilterSettingsPage::category() const
     return QLatin1String(Help::Constants::HELP_CATEGORY);
 }
 
-QString FilterSettingsPage::trCategory() const
+QString FilterSettingsPage::displayCategory() const
 {
     return QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY);
 }
diff --git a/src/plugins/help/filtersettingspage.h b/src/plugins/help/filtersettingspage.h
index 9169c191c72..58421f47bc5 100644
--- a/src/plugins/help/filtersettingspage.h
+++ b/src/plugins/help/filtersettingspage.h
@@ -48,9 +48,9 @@ public:
     FilterSettingsPage(QHelpEngine *helpEngine);
 
     QString id() const;
-    QString trName() const;
+    QString displayName() const;
     QString category() const;
-    QString trCategory() const;
+    QString displayCategory() const;
 
     QWidget *createPage(QWidget *parent);
     void apply();
diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp
index 8702b563bd1..805138143e6 100644
--- a/src/plugins/help/generalsettingspage.cpp
+++ b/src/plugins/help/generalsettingspage.cpp
@@ -71,7 +71,7 @@ QString GeneralSettingsPage::id() const
     return QLatin1String("A.General settings");
 }
 
-QString GeneralSettingsPage::trName() const
+QString GeneralSettingsPage::displayName() const
 {
     return tr("General settings");
 }
@@ -81,7 +81,7 @@ QString GeneralSettingsPage::category() const
     return QLatin1String(Help::Constants::HELP_CATEGORY);
 }
 
-QString GeneralSettingsPage::trCategory() const
+QString GeneralSettingsPage::displayCategory() const
 {
     return QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY);
 }
diff --git a/src/plugins/help/generalsettingspage.h b/src/plugins/help/generalsettingspage.h
index 5ecfbaf2d72..9b63fd7dc3b 100644
--- a/src/plugins/help/generalsettingspage.h
+++ b/src/plugins/help/generalsettingspage.h
@@ -56,9 +56,9 @@ public:
         BookmarkManager *bookmarkManager);
 
     QString id() const;
-    virtual QString trName() const;
+    virtual QString displayName() const;
     QString category() const;
-    QString trCategory() const;
+    QString displayCategory() const;
 
     QWidget *createPage(QWidget *parent);
     void apply();
diff --git a/src/plugins/help/helpindexfilter.cpp b/src/plugins/help/helpindexfilter.cpp
index 162c3d57a69..9ea9ab36361 100644
--- a/src/plugins/help/helpindexfilter.cpp
+++ b/src/plugins/help/helpindexfilter.cpp
@@ -67,12 +67,12 @@ void HelpIndexFilter::updateIndices()
         m_plugin->setIndexFilter(currentFilter);
 }
 
-QString HelpIndexFilter::trName() const
+QString HelpIndexFilter::displayName() const
 {
     return tr("Help index");
 }
 
-QString HelpIndexFilter::name() const
+QString HelpIndexFilter::id() const
 {
     return QLatin1String("HelpIndexFilter");
 }
diff --git a/src/plugins/help/helpindexfilter.h b/src/plugins/help/helpindexfilter.h
index 7094e9adf21..e70343a5521 100644
--- a/src/plugins/help/helpindexfilter.h
+++ b/src/plugins/help/helpindexfilter.h
@@ -52,8 +52,8 @@ public:
     HelpIndexFilter(HelpPlugin *plugin, QHelpEngine *helpEngine);
 
     // ILocatorFilter
-    QString trName() const;
-    QString name() const;
+    QString displayName() const;
+    QString id() const;
     Priority priority() const;
     QList<Locator::FilterEntry> matchesFor(const QString &entry);
     void accept(Locator::FilterEntry selection) const;
diff --git a/src/plugins/help/helpmode.cpp b/src/plugins/help/helpmode.cpp
index 964b0eb17c9..76cb522a740 100644
--- a/src/plugins/help/helpmode.cpp
+++ b/src/plugins/help/helpmode.cpp
@@ -43,8 +43,8 @@ using namespace Help::Internal;
 HelpMode::HelpMode(QWidget *widget, QWidget *centralWidget, QObject *parent)
     : BaseMode(parent), m_centralWidget(centralWidget)
 {
-    setName(tr("Help"));
-    setUniqueModeName(Constants::ID_MODE_HELP);
+    setDisplayName(tr("Help"));
+    setId(QLatin1String(Constants::ID_MODE_HELP));
     setIcon(QIcon(QLatin1String(":/fancyactionbar/images/mode_Reference.png")));
     setPriority(Constants::P_MODE_HELP);
     setWidget(widget);