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/texteditor/displaysettingspage.h b/src/plugins/texteditor/displaysettingspage.h
index 0554aa5149..c6dfe13091 100644
--- a/src/plugins/texteditor/displaysettingspage.h
+++ b/src/plugins/texteditor/displaysettingspage.h
@@ -43,9 +43,9 @@ struct DisplaySettings;
 struct DisplaySettingsPageParameters
 {
     QString id;
-    QString name;
+    QString displayName;
     QString category;
-    QString trCategory;
+    QString displayCategory;
     QString settingsPrefix;
 };
 
@@ -59,9 +59,9 @@ public:
 
     // IOptionsPage
     QString id() const;
-    QString trName() const;
+    QString displayName() const;
     QString category() const;
-    QString trCategory() const;
+    QString displayCategory() const;
 
     QWidget *createPage(QWidget *parent);
     void apply();