diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-04-30 20:50:42 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:49:10 +0200 |
| commit | d44cac4028df512b37b161e9f3fc9f7ba1c504bc (patch) | |
| tree | 2ac4f9c95095863928faf450d9e48d1b3c7c7d87 /src/qml/types | |
| parent | 38b58be83a5cbc65f9c3d7e3d14788e7d6837d7d (diff) | |
Rename V4_OBJECT_NEW back to V4_OBJECT
The _NEW variant was there only temporarily to aid converting
to the new data layout.
Change-Id: I1d126ee0999c8f0a49f5a08c2e8c090497dd6dd5
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/types')
| -rw-r--r-- | src/qml/types/qqmldelegatemodel.cpp | 6 | ||||
| -rw-r--r-- | src/qml/types/qqmldelegatemodel_p_p.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index d8a1c0f982..3a3e5f55df 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -70,7 +70,7 @@ struct DelegateModelGroupFunction: QV4::FunctionObject QV4::ReturnedValue (*code)(QQmlDelegateModelItem *item, uint flag, const QV4::ValueRef arg); } __data; - V4_OBJECT_NEW + V4_OBJECT DelegateModelGroupFunction(QV4::ExecutionContext *scope, uint flag, QV4::ReturnedValue (*code)(QQmlDelegateModelItem *item, uint flag, const QV4::ValueRef arg)) : FunctionObject(scope, QStringLiteral("DelegateModelGroupFunction")) @@ -3215,7 +3215,7 @@ struct QQmlDelegateModelGroupChange : QV4::Object QQmlChangeSet::Change change; } __data; - V4_OBJECT_NEW + V4_OBJECT QQmlDelegateModelGroupChange(QV4::ExecutionEngine *engine) : Object(engine) { @@ -3257,7 +3257,7 @@ class QQmlDelegateModelGroupChangeArray : public QV4::Object struct { QVector<QQmlChangeSet::Change> changes; } __data; - V4_OBJECT_NEW + V4_OBJECT public: QQmlDelegateModelGroupChangeArray(QV4::ExecutionEngine *engine, const QVector<QQmlChangeSet::Change> &changes) : Object(engine) diff --git a/src/qml/types/qqmldelegatemodel_p_p.h b/src/qml/types/qqmldelegatemodel_p_p.h index 3e8cfd32b3..652c772aa5 100644 --- a/src/qml/types/qqmldelegatemodel_p_p.h +++ b/src/qml/types/qqmldelegatemodel_p_p.h @@ -168,7 +168,7 @@ struct QQmlDelegateModelItemObject : QV4::Object QQmlDelegateModelItem *item; } __data; - V4_OBJECT_NEW + V4_OBJECT QQmlDelegateModelItemObject(QV4::ExecutionEngine *engine, QQmlDelegateModelItem *item) : Object(engine) |