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/qml/v8/qqmlbuiltinfunctions.cpp | |
| 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/qml/v8/qqmlbuiltinfunctions.cpp')
| -rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index 67b7e789bd..972e8cf2e3 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -77,7 +77,7 @@ QT_BEGIN_NAMESPACE using namespace QV4; -DEFINE_MANAGED_VTABLE(QtObject); +DEFINE_OBJECT_VTABLE(QtObject); struct StaticQtMetaObject : public QObject { @@ -90,7 +90,7 @@ QV4::QtObject::QtObject(ExecutionEngine *v4, QQmlEngine *qmlEngine) , m_platform(0) , m_application(0) { - setVTable(&static_vtbl); + setVTable(staticVTable()); Scope scope(v4); ScopedObject protectThis(scope, this); @@ -1178,12 +1178,12 @@ namespace { struct BindingFunction : public QV4::FunctionObject { - Q_MANAGED + V4_OBJECT BindingFunction(FunctionObject *originalFunction) : QV4::FunctionObject(originalFunction->scope, originalFunction->name) , originalFunction(originalFunction) { - setVTable(&static_vtbl); + setVTable(staticVTable()); bindingKeyFlag = true; } @@ -1203,7 +1203,7 @@ struct BindingFunction : public QV4::FunctionObject QV4::FunctionObject *originalFunction; }; -DEFINE_MANAGED_VTABLE(BindingFunction); +DEFINE_OBJECT_VTABLE(BindingFunction); } |