From 6fe2c1455c9aa1437566390b36bd9cee35ed9d50 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Date: Tue, 19 May 2015 14:57:29 +0200
Subject: [PATCH] QmlPuppet: Remove private dependencies from
 PositionerNodeInstance

Change-Id: I835fb8fa28e49aed049af995f7c3d5105f4dff19
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
---
 .../instances/positionernodeinstance.cpp           | 14 ++++----------
 .../qml2puppet/instances/positionernodeinstance.h  |  3 +--
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.cpp
index d1c56486252..4dc5f66e892 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.cpp
@@ -28,12 +28,12 @@
 **
 ****************************************************************************/
 #include "positionernodeinstance.h"
-#include <private/qquickpositioners_p.h>
+#include <QQuickItem>
 
 namespace QmlDesigner {
 namespace Internal {
 
-PositionerNodeInstance::PositionerNodeInstance(QQuickBasePositioner *item)
+PositionerNodeInstance::PositionerNodeInstance(QQuickItem *item)
     : QuickItemNodeInstance(item)
 {
 }
@@ -55,7 +55,7 @@ bool PositionerNodeInstance::isResizable() const
 
 PositionerNodeInstance::Pointer PositionerNodeInstance::create(QObject *object)
 {
-    QQuickBasePositioner *positioner = qobject_cast<QQuickBasePositioner*>(object);
+    QQuickItem *positioner = qobject_cast<QQuickItem*>(object);
 
     Q_ASSERT(positioner);
 
@@ -71,15 +71,9 @@ PositionerNodeInstance::Pointer PositionerNodeInstance::create(QObject *object)
     return instance;
 }
 
-QQuickBasePositioner *PositionerNodeInstance::positioner() const
-{
-    Q_ASSERT(qobject_cast<QQuickBasePositioner*>(object()));
-    return static_cast<QQuickBasePositioner*>(object());
-}
-
 void PositionerNodeInstance::refreshLayoutable()
 {
-    bool success = QMetaObject::invokeMethod(positioner(), "prePositioning");
+    bool success = QMetaObject::invokeMethod(object(), "prePositioning");
     Q_ASSERT(success);
     Q_UNUSED(success)
 }
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h
index 6a584a480a3..6a0169ed91d 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h
@@ -58,8 +58,7 @@ public:
     PropertyNameList ignoredProperties() const Q_DECL_OVERRIDE;
 
 protected:
-    PositionerNodeInstance(QQuickBasePositioner *item);
-    QQuickBasePositioner *positioner() const;
+    PositionerNodeInstance(QQuickItem *item);
 };
 
 } // namespace Internal