diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp index c7f66c758b9..9e026d5abbf 100644 --- a/src/plugins/qmljseditor/qmljseditor.cpp +++ b/src/plugins/qmljseditor/qmljseditor.cpp @@ -114,7 +114,7 @@ void QmlJSTextEditorWidget::ctor() { m_qmlJsEditorDocument = static_cast(baseTextDocument()); m_outlineCombo = 0; - m_outlineModel = new QmlOutlineModel(this); + m_outlineModel = new QmlOutlineModel(m_qmlJsEditorDocument); m_contextPane = 0; m_findReferences = new FindReferences(this); diff --git a/src/plugins/qmljseditor/qmloutlinemodel.cpp b/src/plugins/qmljseditor/qmloutlinemodel.cpp index 95c6e9efdb6..5d773ea768a 100644 --- a/src/plugins/qmljseditor/qmloutlinemodel.cpp +++ b/src/plugins/qmljseditor/qmloutlinemodel.cpp @@ -298,9 +298,9 @@ private: int indent; }; -QmlOutlineModel::QmlOutlineModel(QmlJSTextEditorWidget *editor) : +QmlOutlineModel::QmlOutlineModel(QmlJSEditorDocument *editor) : QStandardItemModel(editor), - m_textEditor(editor) + m_editorDocument(editor) { m_icons = Icons::instance(); const QString resourcePath = Core::ICore::resourcePath(); @@ -401,7 +401,7 @@ Qt::ItemFlags QmlOutlineModel::flags(const QModelIndex &index) const // only allow drag&drop if we're in sync if (m_semanticInfo.isValid() - && !m_textEditor->isSemanticInfoOutdated()) { + && !m_editorDocument->isSemanticInfoOutdated()) { if (index.parent().isValid()) flags |= Qt::ItemIsDragEnabled; if (index.data(ItemTypeRole) != NonElementBindingType) diff --git a/src/plugins/qmljseditor/qmloutlinemodel.h b/src/plugins/qmljseditor/qmloutlinemodel.h index 663dc71865f..9aeda58cc10 100644 --- a/src/plugins/qmljseditor/qmloutlinemodel.h +++ b/src/plugins/qmljseditor/qmloutlinemodel.h @@ -30,7 +30,7 @@ #ifndef QMLOUTLINEMODEL_H #define QMLOUTLINEMODEL_H -#include "qmljseditor.h" +#include "qmljseditordocument.h" #include #include #include @@ -81,7 +81,7 @@ public: NonElementBindingType // can be filtered out }; - QmlOutlineModel(QmlJSTextEditorWidget *editor); + QmlOutlineModel(QmlJSEditorDocument *editor); // QStandardItemModel QStringList mimeTypes() const; @@ -159,7 +159,7 @@ private: QHash m_itemToIcon; QHash m_itemToNode; QHash m_itemToIdNode; - QmlJSTextEditorWidget *m_textEditor; + QmlJSEditorDocument *m_editorDocument; friend class QmlOutlineModelSync;