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

diff --git a/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp b/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
index 6bce06b142..1eaee5f2ce 100644
--- a/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
+++ b/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
@@ -266,14 +266,14 @@ bool EditorManagerPrototype::closeEditors(const QList<Core::IEditor*> editorsToC
     return  callee()->closeEditors(editorsToClose, askAboutModifiedEditors);
 }
 
-Core::IEditor *EditorManagerPrototype::openEditor(const QString &fileName, const QString &editorKind)
+Core::IEditor *EditorManagerPrototype::openEditor(const QString &fileName, const QString &editorId)
 {
-    return callee()->openEditor(fileName, editorKind);
+    return callee()->openEditor(fileName, editorId);
 }
 
-Core::IEditor *EditorManagerPrototype::newFile(const QString &editorKind, QString titlePattern, const QString &contents)
+Core::IEditor *EditorManagerPrototype::newFile(const QString &editorId, QString titlePattern, const QString &contents)
 {
-    return callee()->openEditorWithContents(editorKind, &titlePattern, contents);
+    return callee()->openEditorWithContents(editorId, &titlePattern, contents);
 }
 
 int EditorManagerPrototype::makeEditorWritable(Core::IEditor *editor)
@@ -310,9 +310,9 @@ void EditorPrototype::setDisplayName(const QString &title)
     callee()->setDisplayName(title);
 }
 
-QString EditorPrototype::kind() const
+QString EditorPrototype::id() const
 {
-    return  QLatin1String(callee()->kind());
+    return  callee()->id();
 }
 
 bool EditorPrototype::duplicateSupported() const