diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2012-05-17 11:02:59 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-18 10:36:42 +0200 |
| commit | 276a86592a529eb0a1659764acaa4cf9f5e112a0 (patch) | |
| tree | bf078acf86a4249b23b7cf048f6c5add3bbe2741 /src/corelib/kernel/qmetaobject.cpp | |
| parent | 6d7b003ac8381cf2af6ebcd255786d8e3afd21b8 (diff) | |
Encapsulate the dynamic meta object pointer
This change allows us to delay creating the actual meta object
until it is actually required.
Change-Id: I1c4a4226bd82fa606b206dd60322f49b49c32463
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qmetaobject.cpp')
| -rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index c91cf60cc9..5132d97ff3 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -300,8 +300,8 @@ int QMetaObject::static_metacall(Call cl, int idx, void **argv) const */ int QMetaObject::metacall(QObject *object, Call cl, int idx, void **argv) { - if (QMetaObject *mo = object->d_ptr->metaObject) - return static_cast<QAbstractDynamicMetaObject*>(mo)->metaCall(cl, idx, argv); + if (object->d_ptr->metaObject) + return object->d_ptr->metaObject->metaCall(object, cl, idx, argv); else return object->qt_metacall(cl, idx, argv); } |