From 820223a8f55dfdda27bd1e4393aefa902ed72a67 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@digia.com>
Date: Tue, 10 Sep 2013 15:01:15 +0200
Subject: [PATCH] QmlDesigner: Re factor inline methods in
NodeInstanceMetaObject
Change-Id: I9130b166a077fd0add21b65cab8fa7eee829386d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
.../instances/nodeinstancemetaobject.cpp | 21 ++++++++++++++++++
.../instances/nodeinstancemetaobject.h | 22 +++++--------------
2 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.cpp
index a33a8cd34af..8cfdae383cf 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.cpp
@@ -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)
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.h
index 5f40e851ea6..6615baa76f7 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.h
@@ -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 QMetaObject *metaObjectParent() const
- {
- if (QQmlVMEMetaObject::parent.isT1())
- return QQmlVMEMetaObject::parent.asT1()->toDynamicMetaObject(QQmlVMEMetaObject::object);
-
- return QQmlVMEMetaObject::parent.asT2();
- }
-
- int propertyOffset() const { return cache->propertyOffset(); }
+ const QAbstractDynamicMetaObject *dynamicMetaObjectParent() const;
+
+ const QMetaObject *metaObjectParent() const;
+
+ int propertyOffset() const;
int count() const;
QByteArray name(int) const;
--
GitLab