forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user