feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlPuppet: Remove private dependencies from BehaviorNodeInstance

Browse Source 
Change-Id: I16f2c4189f7b68bf1cff90d0a9987b4bf4212905
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2015-05-19 14:44:47 +02:00
committed by Thomas Hartmann
parent 43d716bb5a
commit 0d67510270
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.cpp
View File

@@ -30,7 +30,7 @@
#include "behaviornodeinstance.h" #include "behaviornodeinstance.h"
#include <private/qquickbehavior_p.h> #include <qmlprivategate.h>
namespace QmlDesigner { namespace QmlDesigner {
namespace Internal { namespace Internal {
@@ -43,15 +43,11 @@ BehaviorNodeInstance::BehaviorNodeInstance(QObject *object)
BehaviorNodeInstance::Pointer BehaviorNodeInstance::create(QObject *object) BehaviorNodeInstance::Pointer BehaviorNodeInstance::create(QObject *object)
{ {
QQuickBehavior* behavior = qobject_cast<QQuickBehavior*>(object); Pointer instance(new BehaviorNodeInstance(object));
Q_ASSERT(behavior);
Pointer instance(new BehaviorNodeInstance(behavior));
instance->populateResetHashes(); instance->populateResetHashes();
behavior->setEnabled(false); QmlPrivateGate::disableBehaivour(object);
return instance; return instance;
} }

10
share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.cpp
View File

@@ -42,8 +42,9 @@
#include <private/qobject_p.h> #include <private/qobject_p.h>
#include <private/qqmltimer_p.h> #include <private/qqmltimer_p.h>
#include <private/qquicktransition_p.h>
#include <private/qquickanimation_p.h> #include <private/qquickanimation_p.h>
#include <private/qquicktransition_p.h>
#include <private/qquickbehavior_p.h>
#include <private/qquicktext_p.h> #include <private/qquicktext_p.h>
#include <private/qquicktextinput_p.h> #include <private/qquicktextinput_p.h>
#include <private/qquicktextedit_p.h> #include <private/qquicktextedit_p.h>
@@ -564,6 +565,13 @@ void disableTransition(QObject *object)
transition->setFromState("invalidState"); transition->setFromState("invalidState");
} }
void disableBehaivour(QObject *object)
{
QQuickBehavior* behavior = qobject_cast<QQuickBehavior*>(object);
Q_ASSERT(behavior);
behavior->setEnabled(false);
}
ComponentCompleteDisabler::ComponentCompleteDisabler() ComponentCompleteDisabler::ComponentCompleteDisabler()
{ {
DesignerSupport::disableComponentComplete(); DesignerSupport::disableComponentComplete();

1
share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h
View File

@@ -97,6 +97,7 @@ public:
void disableNativeTextRendering(QQuickItem *item); void disableNativeTextRendering(QQuickItem *item);
void disableTextCursor(QQuickItem *item); void disableTextCursor(QQuickItem *item);
void disableTransition(QObject *object); void disableTransition(QObject *object);
void disableBehaivour(QObject *object);
} // namespace QmlPrivateGate } // namespace QmlPrivateGate
} // namespace Internal } // namespace Internal