QmlJSEditor: Remove temporary code assists setup hack

It's taken care of by the normal factory based setup now.

Change-Id: Ia53551740cf5ef2998765ea1003ba8e7f9c30e46
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

4 files changed, 0 insertions, 13 deletions

diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index 5fb099c6d5..f5a0a05d26 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -883,11 +883,6 @@ QmlJSEditor::QmlJSEditor()
     setCompletionAssistProvider(ExtensionSystem::PluginManager::getObject<Internal::QmlJSCompletionAssistProvider>());
 }
 
-void QmlJSEditor::finalizeInitialization()
-{
-    configureCodeAssistant();
-}
-
 bool QmlJSEditor::isDesignModePreferred() const
 {
     // stay in design mode if we are there
diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h
index 8f89e4f88b..db343a39c2 100644
--- a/src/plugins/qmljseditor/qmljseditor.h
+++ b/src/plugins/qmljseditor/qmljseditor.h
@@ -147,7 +147,6 @@ public:
 
     bool open(QString *errorString, const QString &fileName, const QString &realFileName);
     bool isDesignModePreferred() const;
-    void finalizeInitialization();
 };
 
 class QmlJSEditorFactory : public TextEditor::BaseTextEditorFactory
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index 75a581111f..3f6fca2624 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -6551,11 +6551,6 @@ void BaseTextEditor::setEditorWidget(BaseTextEditorWidget *widget)
     setWidget(widget);
 }
 
-void BaseTextEditor::configureCodeAssistant()
-{
-    editorWidget()->d->m_codeAssistant.configure(this);
-}
-
 BaseTextEditor::~BaseTextEditor()
 {
     delete m_widget;
diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h
index 254ae39885..f14f9cba62 100644
--- a/src/plugins/texteditor/basetexteditor.h
+++ b/src/plugins/texteditor/basetexteditor.h
@@ -205,8 +205,6 @@ public:
     // FIXME: Only used to delay initialization from CppEditor.
     // There should be something simpler.
     void setCompletionAssistProvider(const std::function<CompletionAssistProvider *()> &provider);
-    // FIXME: Remove.
-    void configureCodeAssistant();
 
 signals:
     void markRequested(TextEditor::BaseTextEditor *editor, int line, TextEditor::BaseTextEditor::MarkRequestKind kind);