From 0d67510270b66e1576554d5d83542e94aa937ebf Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Date: Tue, 19 May 2015 14:44:47 +0200
Subject: [PATCH] QmlPuppet: Remove private dependencies from
 BehaviorNodeInstance

Change-Id: I16f2c4189f7b68bf1cff90d0a9987b4bf4212905
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
---
 .../qml2puppet/instances/behaviornodeinstance.cpp      | 10 +++-------
 .../qml/qmlpuppet/qmlprivategate/qmlprivategate.cpp    | 10 +++++++++-
 .../qml/qmlpuppet/qmlprivategate/qmlprivategate.h      |  1 +
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.cpp
index c751f232a7f..d22bd5376be 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.cpp
@@ -30,7 +30,7 @@
 
 #include "behaviornodeinstance.h"
 
-#include <private/qquickbehavior_p.h>
+#include <qmlprivategate.h>
 
 namespace QmlDesigner {
 namespace Internal {
@@ -43,15 +43,11 @@ BehaviorNodeInstance::BehaviorNodeInstance(QObject *object)
 
 BehaviorNodeInstance::Pointer BehaviorNodeInstance::create(QObject *object)
 {
-    QQuickBehavior* behavior = qobject_cast<QQuickBehavior*>(object);
-
-    Q_ASSERT(behavior);
-
-    Pointer instance(new BehaviorNodeInstance(behavior));
+    Pointer instance(new BehaviorNodeInstance(object));
 
     instance->populateResetHashes();
 
-    behavior->setEnabled(false);
+    QmlPrivateGate::disableBehaivour(object);
 
     return instance;
 }
diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.cpp b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.cpp
index 9d941a62e3b..93c9296fb39 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.cpp
@@ -42,8 +42,9 @@
 
 #include <private/qobject_p.h>
 #include <private/qqmltimer_p.h>
-#include <private/qquicktransition_p.h>
 #include <private/qquickanimation_p.h>
+#include <private/qquicktransition_p.h>
+#include <private/qquickbehavior_p.h>
 #include <private/qquicktext_p.h>
 #include <private/qquicktextinput_p.h>
 #include <private/qquicktextedit_p.h>
@@ -564,6 +565,13 @@ void disableTransition(QObject *object)
     transition->setFromState("invalidState");
 }
 
+void disableBehaivour(QObject *object)
+{
+    QQuickBehavior* behavior = qobject_cast<QQuickBehavior*>(object);
+    Q_ASSERT(behavior);
+    behavior->setEnabled(false);
+}
+
 ComponentCompleteDisabler::ComponentCompleteDisabler()
 {
     DesignerSupport::disableComponentComplete();
diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h
index 206734aeeaa..04670ce4aa2 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h
+++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h
@@ -97,6 +97,7 @@ public:
     void disableNativeTextRendering(QQuickItem *item);
     void disableTextCursor(QQuickItem *item);
     void disableTransition(QObject *object);
+    void disableBehaivour(QObject *object);
 
 } // namespace QmlPrivateGate
 } // namespace Internal