Minor QmlMetaProperty cleanup

2 files changed, 35 insertions, 20 deletions

diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index ec143a7..fbe41dd 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -646,28 +646,11 @@ QVariant QmlMetaProperty::read() const
             if (sig && sig->index() == d->coreIdx) 
                 return sig->expression()->expression();
         }
+
     } else if (type() & Property) {
-        if (type() & Attached) {
-            return QVariant::fromValue(d->attachedObject());
-        } else if(type() & ValueTypeProperty) {
-            QmlEnginePrivate *ep = d->context?static_cast<QmlEnginePrivate *>(QObjectPrivate::get(d->context->engine())):0;
-            QmlValueType *valueType = 0;
-            if (ep)
-                valueType = ep->valueTypes[d->valueTypeId];
-            else
-                valueType = QmlValueTypeFactory::valueType(d->valueTypeId);
-            Q_ASSERT(valueType);
-
-            valueType->read(object(), d->coreIdx);
-            QVariant rv =
-                valueType->metaObject()->property(d->valueTypeIdx).read(valueType);
-            if (!ep)
-                delete valueType;
-            return rv;
 
-        } else {
-            return d->object->metaObject()->property(d->coreIdx).read(object());
-        }
+        return d->readValueProperty();
+
     }
     return QVariant();
 }
@@ -696,6 +679,36 @@ void QmlMetaPropertyPrivate::writeSignalProperty(const QVariant &value)
     }
 }
 
+QVariant QmlMetaPropertyPrivate::readValueProperty()
+{
+    if (type & QmlMetaProperty::Attached) {
+
+        return QVariant::fromValue(attachedObject());
+
+    } else if(type & QmlMetaProperty::ValueTypeProperty) {
+
+        QmlEnginePrivate *ep = context?QmlEnginePrivate::get(context->engine()):0;
+        QmlValueType *valueType = 0;
+        if (ep)
+            valueType = ep->valueTypes[valueTypeId];
+        else
+            valueType = QmlValueTypeFactory::valueType(valueTypeId);
+        Q_ASSERT(valueType);
+
+        valueType->read(object, coreIdx);
+        QVariant rv =
+            valueType->metaObject()->property(valueTypeIdx).read(valueType);
+        if (!ep)
+            delete valueType;
+        return rv;
+
+    } else {
+
+        return object->metaObject()->property(coreIdx).read(object.data());
+
+    }
+}
+
 void QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value,
                                                 QmlMetaProperty::WriteSource source)
 {
diff --git a/src/declarative/qml/qmlmetaproperty_p.h b/src/declarative/qml/qmlmetaproperty_p.h
index 0d96174..3193aaf 100644
--- a/src/declarative/qml/qmlmetaproperty_p.h
+++ b/src/declarative/qml/qmlmetaproperty_p.h
@@ -98,6 +98,8 @@ public:
     QmlMetaProperty::PropertyCategory propertyCategory() const;
 
     void writeSignalProperty(const QVariant &);
+
+    QVariant readValueProperty();
     void writeValueProperty(const QVariant &, QmlMetaProperty::WriteSource);
 
     static quint32 saveValueType(int, int);