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

QmlDesigner: Re factor inline methods in NodeInstanceMetaObject

Browse Source 
Change-Id: I9130b166a077fd0add21b65cab8fa7eee829386d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-09-10 15:01:15 +02:00
parent eecc27e757
commit 820223a8f5
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.cpp
+21
View File
@@ -228,6 +228,27 @@ QVariant NodeInstanceMetaObject::propertyWriteValue(int, const QVariant &value)
return value;
}
const QAbstractDynamicMetaObject *NodeInstanceMetaObject::dynamicMetaObjectParent() const
{
if (QQmlVMEMetaObject::parent.isT1())
return QQmlVMEMetaObject::parent.asT1()->toDynamicMetaObject(QQmlVMEMetaObject::object);
else
return 0;
}
const QMetaObject *NodeInstanceMetaObject::metaObjectParent() const
{
if (QQmlVMEMetaObject::parent.isT1())
return QQmlVMEMetaObject::parent.asT1()->toDynamicMetaObject(QQmlVMEMetaObject::object);
return QQmlVMEMetaObject::parent.asT2();
}
int NodeInstanceMetaObject::propertyOffset() const
{
return cache->propertyOffset();
}
int NodeInstanceMetaObject::openMetaCall(QMetaObject::Call call, int id, void **a)
{
if ((call == QMetaObject::ReadProperty || call == QMetaObject::WriteProperty)
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.h
+3 -15
View File
@@ -68,23 +68,11 @@ protected:
QObject *myObject() const { return QQmlVMEMetaObject::object; }
QAbstractDynamicMetaObject *parent() const { return const_cast<QAbstractDynamicMetaObject *>(dynamicMetaObjectParent()); }
const QAbstractDynamicMetaObject *dynamicMetaObjectParent() const
{
if (QQmlVMEMetaObject::parent.isT1())
return QQmlVMEMetaObject::parent.asT1()->toDynamicMetaObject(QQmlVMEMetaObject::object);
else
return 0;
}
const QAbstractDynamicMetaObject *dynamicMetaObjectParent() const;
const QMetaObject *metaObjectParent() const
{
if (QQmlVMEMetaObject::parent.isT1())
return QQmlVMEMetaObject::parent.asT1()->toDynamicMetaObject(QQmlVMEMetaObject::object);
const QMetaObject *metaObjectParent() const;
return QQmlVMEMetaObject::parent.asT2();
}
int propertyOffset() const { return cache->propertyOffset(); }
int propertyOffset() const;
int count() const;
QByteArray name(int) const;