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

diff --git a/src/plugins/texteditor/textfilewizard.cpp b/src/plugins/texteditor/textfilewizard.cpp
index 9b504854e9..9e7595d458 100644
--- a/src/plugins/texteditor/textfilewizard.cpp
+++ b/src/plugins/texteditor/textfilewizard.cpp
@@ -35,13 +35,13 @@
 using namespace TextEditor;
 
 TextFileWizard::TextFileWizard(const QString &mimeType,
-                               const QString &editorKind,
+                               const QString &editorId,
                                const QString &suggestedFileName,
                                const BaseFileWizardParameters &parameters,
                                QObject *parent) :
     Core::StandardFileWizard(parameters, parent),
     m_mimeType(mimeType),
-    m_editorKind(editorKind),
+    m_editorId(editorId),
     m_suggestedFileName(suggestedFileName)
 {
 }
@@ -53,6 +53,6 @@ Core::GeneratedFiles
     const QString suffix = preferredSuffix(m_mimeType);
     const QString fileName = Core::BaseFileWizard::buildFileName(path, name, suffix);
     Core::GeneratedFile file(fileName);
-    file.setEditorKind(m_editorKind);
+    file.setEditorId(m_editorId);
     return Core::GeneratedFiles() << file;
 }