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

QmlPuppet: Remove private dependencies from PositionerNodeInstance

Browse Source 
Change-Id: I835fb8fa28e49aed049af995f7c3d5105f4dff19
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2015-05-19 14:57:29 +02:00
committed by Thomas Hartmann
parent 0d67510270
commit 6fe2c1455c
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.cpp
View File

@@ -28,12 +28,12 @@
** **
****************************************************************************/ ****************************************************************************/
#include "positionernodeinstance.h" #include "positionernodeinstance.h"
#include <private/qquickpositioners_p.h> #include <QQuickItem>
namespace QmlDesigner { namespace QmlDesigner {
namespace Internal { namespace Internal {
PositionerNodeInstance::PositionerNodeInstance(QQuickBasePositioner *item) PositionerNodeInstance::PositionerNodeInstance(QQuickItem *item)
: QuickItemNodeInstance(item) : QuickItemNodeInstance(item)
{ {
} }
@@ -55,7 +55,7 @@ bool PositionerNodeInstance::isResizable() const
PositionerNodeInstance::Pointer PositionerNodeInstance::create(QObject *object) PositionerNodeInstance::Pointer PositionerNodeInstance::create(QObject *object)
{ {
QQuickBasePositioner *positioner = qobject_cast<QQuickBasePositioner*>(object); QQuickItem *positioner = qobject_cast<QQuickItem*>(object);
Q_ASSERT(positioner); Q_ASSERT(positioner);
@@ -71,15 +71,9 @@ PositionerNodeInstance::Pointer PositionerNodeInstance::create(QObject *object)
return instance; return instance;
} }
QQuickBasePositioner *PositionerNodeInstance::positioner() const
{
Q_ASSERT(qobject_cast<QQuickBasePositioner*>(object()));
return static_cast<QQuickBasePositioner*>(object());
}
void PositionerNodeInstance::refreshLayoutable() void PositionerNodeInstance::refreshLayoutable()
{ {
bool success = QMetaObject::invokeMethod(positioner(), "prePositioning"); bool success = QMetaObject::invokeMethod(object(), "prePositioning");
Q_ASSERT(success); Q_ASSERT(success);
Q_UNUSED(success) Q_UNUSED(success)
} }

3
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h
View File

@@ -58,8 +58,7 @@ public:
PropertyNameList ignoredProperties() const Q_DECL_OVERRIDE; PropertyNameList ignoredProperties() const Q_DECL_OVERRIDE;
protected: protected:
PositionerNodeInstance(QQuickBasePositioner *item); PositionerNodeInstance(QQuickItem *item);
QQuickBasePositioner *positioner() const;
}; };
} // namespace Internal } // namespace Internal