diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-01-20 13:51:00 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-21 20:46:50 +0100 |
| commit | 7d4fc70e70ca566900c01aa7c5e3ec4770d15933 (patch) | |
| tree | 8b223bae1ab0604788abae489e87ec2fbd5298e8 /src/qml/types | |
| parent | 3efae4fc7fff96f147f79013ef9fff9c31557229 (diff) | |
Split ManagedVTable into two classes
Keep the basic methods in ManagedVTable, but have
the Object related stuff in an ObjectVTable class.
Change-Id: I9b068acf3caef813686227b8d935e7df1a7d1a6e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/types')
| -rw-r--r-- | src/qml/types/qqmldelegatemodel.cpp | 20 | ||||
| -rw-r--r-- | src/qml/types/qqmldelegatemodel_p_p.h | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index 4c8635b29c..f10f54038d 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -61,7 +61,7 @@ class QQmlDelegateModelItem; struct DelegateModelGroupFunction: QV4::FunctionObject { - Q_MANAGED + V4_OBJECT QV4::ReturnedValue (*code)(QQmlDelegateModelItem *item, uint flag, const QV4::ValueRef arg); uint flag; @@ -71,7 +71,7 @@ struct DelegateModelGroupFunction: QV4::FunctionObject , code(code) , flag(flag) { - setVTable(&static_vtbl); + setVTable(staticVTable()); } static QV4::ReturnedValue construct(QV4::Managed *m, QV4::CallData *) @@ -93,7 +93,7 @@ struct DelegateModelGroupFunction: QV4::FunctionObject } }; -DEFINE_MANAGED_VTABLE(DelegateModelGroupFunction); +DEFINE_OBJECT_VTABLE(DelegateModelGroupFunction); @@ -1795,7 +1795,7 @@ QV4::ReturnedValue QQmlDelegateModelItem::get_index(QQmlDelegateModelItem *thisI //--------------------------------------------------------------------------- -DEFINE_MANAGED_VTABLE(QQmlDelegateModelItemObject); +DEFINE_OBJECT_VTABLE(QQmlDelegateModelItemObject); QQmlDelegateModelItemObject::~QQmlDelegateModelItemObject() { @@ -3154,11 +3154,11 @@ void QQmlPartsModel::emitModelUpdated(const QQmlChangeSet &changeSet, bool reset struct QQmlDelegateModelGroupChange : QV4::Object { - Q_MANAGED + V4_OBJECT QQmlDelegateModelGroupChange(QV4::ExecutionEngine *engine) : Object(engine) { - setVTable(&static_vtbl); + setVTable(staticVTable()); } static QV4::ReturnedValue method_get_index(QV4::CallContext *ctx) { @@ -3188,16 +3188,16 @@ struct QQmlDelegateModelGroupChange : QV4::Object QQmlChangeSet::Change change; }; -DEFINE_MANAGED_VTABLE(QQmlDelegateModelGroupChange); +DEFINE_OBJECT_VTABLE(QQmlDelegateModelGroupChange); class QQmlDelegateModelGroupChangeArray : public QV4::Object { - Q_MANAGED + V4_OBJECT public: QQmlDelegateModelGroupChangeArray(QV4::ExecutionEngine *engine) : Object(engine) { - setVTable(&static_vtbl); + setVTable(staticVTable()); setArrayType(QV4::ArrayData::Custom); } virtual ~QQmlDelegateModelGroupChangeArray() {} @@ -3253,7 +3253,7 @@ public: }; -DEFINE_MANAGED_VTABLE(QQmlDelegateModelGroupChangeArray); +DEFINE_OBJECT_VTABLE(QQmlDelegateModelGroupChangeArray); class QQmlDelegateModelGroupRemoveArray : public QQmlDelegateModelGroupChangeArray { diff --git a/src/qml/types/qqmldelegatemodel_p_p.h b/src/qml/types/qqmldelegatemodel_p_p.h index f78cf38535..32b1154d30 100644 --- a/src/qml/types/qqmldelegatemodel_p_p.h +++ b/src/qml/types/qqmldelegatemodel_p_p.h @@ -161,11 +161,11 @@ protected: struct QQmlDelegateModelItemObject : QV4::Object { - Q_MANAGED; + V4_OBJECT; QQmlDelegateModelItemObject(QV4::ExecutionEngine *engine, QQmlDelegateModelItem *item) : Object(engine) , item(item) - { setVTable(&static_vtbl); } + { setVTable(staticVTable()); } ~QQmlDelegateModelItemObject(); static void destroy(Managed *that); |