QmlJsEditor: Set language ID directly

Gets rid of an unnecessary indirection.

Change-Id: I2690b00175b60de03e6f9944a8ccd29a7914347d
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

4 files changed, 5 insertions, 13 deletions

diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index dc0b419a0a..dca375e7d3 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -46,6 +46,7 @@
 #include <qmljs/qmljsmodelmanagerinterface.h>
 #include <qmljs/qmljsutils.h>
 
+#include <qmljstools/qmljstoolsconstants.h>
 #include <qmljstools/qmljsindenter.h>
 #include <qmljstools/qmljsqtstylecodeformatter.h>
 
@@ -466,6 +467,7 @@ QmlJSTextEditorWidget::QmlJSTextEditorWidget(QWidget *parent) :
     setCodeFoldingSupported(true);
     setIndenter(new Indenter);
     setAutoCompleter(new AutoCompleter);
+    setLanguageSettingsId(QmlJSTools::Constants::QML_JS_SETTINGS_ID);
 
     m_updateDocumentTimer = new QTimer(this);
     m_updateDocumentTimer->setInterval(UPDATE_DOCUMENT_DEFAULT_INTERVAL);
@@ -583,7 +585,7 @@ IEditor *QmlJSEditor::duplicate(QWidget *parent)
 {
     QmlJSTextEditorWidget *newEditor = new QmlJSTextEditorWidget(parent);
     newEditor->duplicateFrom(editorWidget());
-    QmlJSEditorPlugin::instance()->initializeEditor(newEditor);
+    TextEditor::TextEditorSettings::initializeEditor(newEditor);
     return newEditor->editor();
 }
 
diff --git a/src/plugins/qmljseditor/qmljseditorfactory.cpp b/src/plugins/qmljseditor/qmljseditorfactory.cpp
index 90a8825bc0..5909fde6e7 100644
--- a/src/plugins/qmljseditor/qmljseditorfactory.cpp
+++ b/src/plugins/qmljseditor/qmljseditorfactory.cpp
@@ -35,6 +35,7 @@
 
 #include <qmljstools/qmljstoolsconstants.h>
 #include <texteditor/texteditoractionhandler.h>
+#include <texteditor/texteditorsettings.h>
 
 #include <QCoreApplication>
 
@@ -64,7 +65,7 @@ QmlJSEditorFactory::QmlJSEditorFactory(QObject *parent)
 Core::IEditor *QmlJSEditorFactory::createEditor(QWidget *parent)
 {
     QmlJSTextEditorWidget *rc = new QmlJSTextEditorWidget(parent);
-    QmlJSEditorPlugin::instance()->initializeEditor(rc);
+    TextEditor::TextEditorSettings::initializeEditor(rc);
     return rc->editor();
 }
 
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp
index f7f0ce5eec..27e1468b69 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.cpp
+++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp
@@ -62,7 +62,6 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <projectexplorer/taskhub.h>
 #include <texteditor/texteditorconstants.h>
-#include <texteditor/texteditorsettings.h>
 #include <texteditor/textfilewizard.h>
 #include <utils/qtcassert.h>
 #include <utils/json.h>
@@ -252,14 +251,6 @@ ExtensionSystem::IPlugin::ShutdownFlag QmlJSEditorPlugin::aboutToShutdown()
     return IPlugin::aboutToShutdown();
 }
 
-void QmlJSEditorPlugin::initializeEditor(QmlJSTextEditorWidget *editor)
-{
-    QTC_CHECK(m_instance);
-
-    editor->setLanguageSettingsId(QmlJSTools::Constants::QML_JS_SETTINGS_ID);
-    TextEditor::TextEditorSettings::initializeEditor(editor);
-}
-
 Utils::JsonSchemaManager *QmlJSEditorPlugin::jsonManager() const
 {
     return m_jsonManager.data();
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.h b/src/plugins/qmljseditor/qmljseditorplugin.h
index 1c33050373..b75230d940 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.h
+++ b/src/plugins/qmljseditor/qmljseditorplugin.h
@@ -88,8 +88,6 @@ public:
 
     QmlJSQuickFixAssistProvider *quickFixAssistProvider() const;
 
-    void initializeEditor(QmlJSTextEditorWidget *editor);
-
     Utils::JsonSchemaManager *jsonManager() const;
 
 public Q_SLOTS: