feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJSEditor: Remove temporary code assists setup hack

Browse Source 
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:
hjk
2014-09-02 12:16:48 +02:00
parent 775825aecd
commit 8dc9d67e89
4 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmljseditor/qmljseditor.cpp
View File

@@ -883,11 +883,6 @@ QmlJSEditor::QmlJSEditor()
setCompletionAssistProvider(ExtensionSystem::PluginManager::getObject<Internal::QmlJSCompletionAssistProvider>()); setCompletionAssistProvider(ExtensionSystem::PluginManager::getObject<Internal::QmlJSCompletionAssistProvider>());
} }
void QmlJSEditor::finalizeInitialization()
{
configureCodeAssistant();
}
bool QmlJSEditor::isDesignModePreferred() const bool QmlJSEditor::isDesignModePreferred() const
{ {
// stay in design mode if we are there // stay in design mode if we are there

1
src/plugins/qmljseditor/qmljseditor.h
View File

@@ -147,7 +147,6 @@ public:
bool open(QString *errorString, const QString &fileName, const QString &realFileName); bool open(QString *errorString, const QString &fileName, const QString &realFileName);
bool isDesignModePreferred() const; bool isDesignModePreferred() const;
void finalizeInitialization();
}; };
class QmlJSEditorFactory : public TextEditor::BaseTextEditorFactory class QmlJSEditorFactory : public TextEditor::BaseTextEditorFactory

5
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -6551,11 +6551,6 @@ void BaseTextEditor::setEditorWidget(BaseTextEditorWidget *widget)
setWidget(widget); setWidget(widget);
} }
void BaseTextEditor::configureCodeAssistant()
{
editorWidget()->d->m_codeAssistant.configure(this);
}
BaseTextEditor::~BaseTextEditor() BaseTextEditor::~BaseTextEditor()
{ {
delete m_widget; delete m_widget;

2
src/plugins/texteditor/basetexteditor.h
View File

@@ -205,8 +205,6 @@ public:
// FIXME: Only used to delay initialization from CppEditor. // FIXME: Only used to delay initialization from CppEditor.
// There should be something simpler. // There should be something simpler.
void setCompletionAssistProvider(const std::function<CompletionAssistProvider *()> &provider); void setCompletionAssistProvider(const std::function<CompletionAssistProvider *()> &provider);
// FIXME: Remove.
void configureCodeAssistant();
signals: signals:
void markRequested(TextEditor::BaseTextEditor *editor, int line, TextEditor::BaseTextEditor::MarkRequestKind kind); void markRequested(TextEditor::BaseTextEditor *editor, int line, TextEditor::BaseTextEditor::MarkRequestKind kind);