diff --git a/src/plugins/qmljseditor/qmljseditor.pro b/src/plugins/qmljseditor/qmljseditor.pro index 72fa4657623..7695cbf9480 100644 --- a/src/plugins/qmljseditor/qmljseditor.pro +++ b/src/plugins/qmljseditor/qmljseditor.pro @@ -27,7 +27,8 @@ HEADERS += \ qmljsoutline.h \ qmloutlinemodel.h \ qmltaskmanager.h \ - qmljseditorcodeformatter.h + qmljseditorcodeformatter.h \ + qmljsoutlinetreeview.h SOURCES += \ qmljscodecompletion.cpp \ @@ -48,7 +49,8 @@ SOURCES += \ qmloutlinemodel.cpp \ qmltaskmanager.cpp \ qmljsquickfixes.cpp \ - qmljseditorcodeformatter.cpp + qmljseditorcodeformatter.cpp \ + qmljsoutlinetreeview.cpp RESOURCES += qmljseditor.qrc OTHER_FILES += QmlJSEditor.pluginspec QmlJSEditor.mimetypes.xml diff --git a/src/plugins/qmljseditor/qmljsoutline.cpp b/src/plugins/qmljseditor/qmljsoutline.cpp index 66d505672b7..ba0e17390ec 100644 --- a/src/plugins/qmljseditor/qmljsoutline.cpp +++ b/src/plugins/qmljseditor/qmljsoutline.cpp @@ -1,5 +1,6 @@ #include "qmljsoutline.h" #include "qmloutlinemodel.h" +#include "qmljsoutlinetreeview.h" #include #include @@ -19,18 +20,6 @@ enum { namespace QmlJSEditor { namespace Internal { -QmlJSOutlineTreeView::QmlJSOutlineTreeView(QWidget *parent) : - Utils::NavigationTreeView(parent) -{ - // see also CppOutlineTreeView - setFocusPolicy(Qt::NoFocus); - setExpandsOnDoubleClick(false); - - setDragEnabled(true); - viewport()->setAcceptDrops(true); - setDropIndicatorShown(true); - setDragDropMode(InternalMove); -} QmlJSOutlineFilterModel::QmlJSOutlineFilterModel(QObject *parent) : QSortFilterProxyModel(parent) diff --git a/src/plugins/qmljseditor/qmljsoutline.h b/src/plugins/qmljseditor/qmljsoutline.h index 40324266633..65481b770ce 100644 --- a/src/plugins/qmljseditor/qmljsoutline.h +++ b/src/plugins/qmljseditor/qmljsoutline.h @@ -3,10 +3,8 @@ #include "qmljseditor.h" -#include #include -#include #include namespace Core { @@ -20,12 +18,7 @@ class Editor; namespace QmlJSEditor { namespace Internal { -class QmlJSOutlineTreeView : public Utils::NavigationTreeView -{ - Q_OBJECT -public: - QmlJSOutlineTreeView(QWidget *parent = 0); -}; +class QmlJSOutlineTreeView; class QmlJSOutlineFilterModel : public QSortFilterProxyModel { diff --git a/src/plugins/qmljseditor/qmljsoutlinetreeview.cpp b/src/plugins/qmljseditor/qmljsoutlinetreeview.cpp new file mode 100644 index 00000000000..bd1e22a94ce --- /dev/null +++ b/src/plugins/qmljseditor/qmljsoutlinetreeview.cpp @@ -0,0 +1,20 @@ +#include "qmljsoutlinetreeview.h" + +namespace QmlJSEditor { +namespace Internal { + +QmlJSOutlineTreeView::QmlJSOutlineTreeView(QWidget *parent) : + Utils::NavigationTreeView(parent) +{ + // see also CppOutlineTreeView + setFocusPolicy(Qt::NoFocus); + setExpandsOnDoubleClick(false); + + setDragEnabled(true); + viewport()->setAcceptDrops(true); + setDropIndicatorShown(true); + setDragDropMode(InternalMove); +} + +} // namespace Internal +} // namespace QmlJSEditor diff --git a/src/plugins/qmljseditor/qmljsoutlinetreeview.h b/src/plugins/qmljseditor/qmljsoutlinetreeview.h new file mode 100644 index 00000000000..abbeb75b760 --- /dev/null +++ b/src/plugins/qmljseditor/qmljsoutlinetreeview.h @@ -0,0 +1,19 @@ +#ifndef QMLJSOUTLINETREEVIEW_H +#define QMLJSOUTLINETREEVIEW_H + +#include + +namespace QmlJSEditor { +namespace Internal { + +class QmlJSOutlineTreeView : public Utils::NavigationTreeView +{ + Q_OBJECT +public: + QmlJSOutlineTreeView(QWidget *parent = 0); +}; + +} // namespace Internal +} // namespace QmlJSEditor + +#endif // QMLJSOUTLINETREEVIEW_H