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, 4 insertions, 4 deletions

diff --git a/src/plugins/locator/settingspage.cpp b/src/plugins/locator/settingspage.cpp
index c82065d3d8..24f3ac6bd5 100644
--- a/src/plugins/locator/settingspage.cpp
+++ b/src/plugins/locator/settingspage.cpp
@@ -54,7 +54,7 @@ QString SettingsPage::id() const
     return QLatin1String(Constants::FILTER_OPTIONS_PAGE);
 }
 
-QString SettingsPage::trName() const
+QString SettingsPage::displayName() const
 {
     return QCoreApplication::translate("Locator", Locator::Constants::FILTER_OPTIONS_PAGE);
 }
@@ -64,7 +64,7 @@ QString SettingsPage::category() const
     return QLatin1String(Constants::LOCATOR_CATEGORY);
 }
 
-QString SettingsPage::trCategory() const
+QString SettingsPage::displayCategory() const
 {
     return QCoreApplication::translate("Locator", Locator::Constants::LOCATOR_TR_CATEGORY);
 }
@@ -158,9 +158,9 @@ void SettingsPage::updateFilterList()
 
         QString title;
         if (filter->isIncludedByDefault())
-            title = filter->trName();
+            title = filter->displayName();
         else
-            title = tr("%1 (Prefix: %2)").arg(filter->trName()).arg(filter->shortcutString());
+            title = tr("%1 (Prefix: %2)").arg(filter->displayName()).arg(filter->shortcutString());
         QListWidgetItem *item = new QListWidgetItem(title);
         item->setData(Qt::UserRole, qVariantFromValue(filter));
         m_ui.filterList->addItem(item);