diff options
author | Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> | 2015-05-19 17:06:48 +0200 |
---|---|---|
committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2015-05-20 14:02:17 +0000 |
commit | 43d716bb5ab7f933337a51b0f1635715cb15bc6f (patch) | |
tree | cbf6bcc1156338337750f3179defa1acdd3415b4 /share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.cpp | |
parent | d38b1c21a2c4a7096f1385c28aa07e575b7bd325 (diff) |
QmlPuppet: Remove private dependencies from QmlTransitionNodeInstance
Change-Id: I8a5144947469a3c7f368fa6b18781c0d07b4d850
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.cpp')
-rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.cpp | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.cpp index 59c8fe354b..6289e09619 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.cpp @@ -29,28 +29,23 @@ ****************************************************************************/ #include "qmltransitionnodeinstance.h" -#include <private/qquicktransition_p.h> + +#include <qmlprivategate.h> namespace QmlDesigner { namespace Internal { -QmlTransitionNodeInstance::QmlTransitionNodeInstance(QQuickTransition *transition) +QmlTransitionNodeInstance::QmlTransitionNodeInstance(QObject *transition) : ObjectNodeInstance(transition) { } QmlTransitionNodeInstance::Pointer QmlTransitionNodeInstance::create(QObject *object) { - QQuickTransition *transition = qobject_cast<QQuickTransition*>(object); - - Q_ASSERT(transition); - - Pointer instance(new QmlTransitionNodeInstance(transition)); + Pointer instance(new QmlTransitionNodeInstance(object)); instance->populateResetHashes(); - - transition->setToState("invalidState"); - transition->setFromState("invalidState"); + QmlPrivateGate::disableTransition(object); return instance; } @@ -65,10 +60,5 @@ PropertyNameList QmlTransitionNodeInstance::ignoredProperties() const return PropertyNameList() << "from" << "to"; } -QQuickTransition *QmlTransitionNodeInstance::qmlTransition() const -{ - Q_ASSERT(qobject_cast<QQuickTransition*>(object())); - return static_cast<QQuickTransition*>(object()); -} } } |