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, 3 insertions, 2 deletions

diff --git a/src/plugins/texteditor/plaintexteditorfactory.h b/src/plugins/texteditor/plaintexteditorfactory.h
index 9f3f8b4b2c6..f9a812bdb5b 100644
--- a/src/plugins/texteditor/plaintexteditorfactory.h
+++ b/src/plugins/texteditor/plaintexteditorfactory.h
@@ -52,14 +52,15 @@ public:
 
     virtual QStringList mimeTypes() const;
     //Core::IEditorFactory
-    QString kind() const;
+    QString id() const;
+    QString displayName() const;
+
     Core::IFile *open(const QString &fileName);
     Core::IEditor *createEditor(QWidget *parent);
 
     TextEditor::TextEditorActionHandler *actionHandler() const { return m_actionHandler; }
 
 private:
-    const QString m_kind;
     QStringList m_mimeTypes;
     TextEditor::TextEditorActionHandler *m_actionHandler;
 };