From a6c43c63c254f37abce2aae60480de84a716da84 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Mon, 29 Jul 2013 17:25:43 +0200 Subject: [PATCH] QmlDesigner: Remove rootQmlItemNode Change-Id: I5a3ae428b210d1f09d8a3239fe56d887f92dac4c Reviewed-by: Thomas Hartmann --- .../components/stateseditor/stateseditorview.cpp | 2 +- src/plugins/qmldesigner/designercore/include/qmlmodelview.h | 5 ----- src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp | 6 ------ 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp index c45dcb99c90..e0b59df2a60 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp @@ -180,7 +180,7 @@ void StatesEditorView::createNewState() void StatesEditorView::addState() { // can happen when root node is e.g. a ListModel - if (!rootQmlItemNode().isValid()) + if (!QmlItemNode::isValidQmlItemNode(rootModelNode())) return; QStringList modelStateNames = rootStateGroup().names(); diff --git a/src/plugins/qmldesigner/designercore/include/qmlmodelview.h b/src/plugins/qmldesigner/designercore/include/qmlmodelview.h index efa6303f044..86f89375097 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlmodelview.h +++ b/src/plugins/qmldesigner/designercore/include/qmlmodelview.h @@ -51,11 +51,6 @@ public: QmlModelView(QObject *parent) ; - - - QmlItemNode rootQmlItemNode() const; - - }; } //QmlDesigner diff --git a/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp b/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp index aef75c42a00..193b0c73cdd 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp @@ -55,10 +55,4 @@ QmlModelView::QmlModelView(QObject *parent) : AbstractView(parent) { } - -QmlItemNode QmlModelView::rootQmlItemNode() const -{ - return QmlItemNode(rootModelNode()); -} - } //QmlDesigner