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

QmlPuppet: Remove private dependencies from QmlTransitionNodeInstance

Browse Source 
Change-Id: I8a5144947469a3c7f368fa6b18781c0d07b4d850
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2015-05-19 17:06:48 +02:00
committed by Thomas Hartmann
parent d38b1c21a2
commit 43d716bb5a
4 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.cpp
View File

@@ -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());
}
}
}

9
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h
View File

@@ -33,10 +33,6 @@
#include "objectnodeinstance.h"
QT_BEGIN_NAMESPACE
class QQuickTransition;
QT_END_NAMESPACE
namespace QmlDesigner {
namespace Internal {
@@ -52,11 +48,8 @@ public:
PropertyNameList ignoredProperties() const Q_DECL_OVERRIDE;
protected:
QQuickTransition *qmlTransition() const;
private:
QmlTransitionNodeInstance(QQuickTransition *transition);
QmlTransitionNodeInstance(QObject *transition);
};
}
}

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

@@ -47,6 +47,7 @@
#include <private/qquicktext_p.h>
#include <private/qquicktextinput_p.h>
#include <private/qquicktextedit_p.h>
#include <private/qquicktransition_p.h>
#include <designersupport.h>
@@ -555,6 +556,14 @@ void disableTextCursor(QQuickItem *item)
textEdit->setCursorVisible(false);
}
void disableTransition(QObject *object)
{
QQuickTransition *transition = qobject_cast<QQuickTransition*>(object);
Q_ASSERT(transition);
transition->setToState("invalidState");
transition->setFromState("invalidState");
}
ComponentCompleteDisabler::ComponentCompleteDisabler()
{
DesignerSupport::disableComponentComplete();

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

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