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/qqmltypewrapper.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/qqmltypewrapper.cpp')
| -rw-r--r-- | src/qml/qml/qqmltypewrapper.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmltypewrapper.cpp b/src/qml/qml/qqmltypewrapper.cpp index 9c350a54a5..93ad8dc6fe 100644 --- a/src/qml/qml/qqmltypewrapper.cpp +++ b/src/qml/qml/qqmltypewrapper.cpp @@ -54,13 +54,13 @@ QT_BEGIN_NAMESPACE using namespace QV4; -DEFINE_MANAGED_VTABLE(QmlTypeWrapper); +DEFINE_OBJECT_VTABLE(QmlTypeWrapper); QmlTypeWrapper::QmlTypeWrapper(QV8Engine *engine) : Object(QV8Engine::getV4(engine)), v8(engine), mode(IncludeEnums), type(0), typeNamespace(0), importNamespace(0) { - setVTable(&static_vtbl); + setVTable(staticVTable()); } QmlTypeWrapper::~QmlTypeWrapper() @@ -277,7 +277,7 @@ PropertyAttributes QmlTypeWrapper::query(const Managed *m, StringRef name) Scope scope(m->engine()); ScopedString n(scope, name); bool hasProperty = false; - const_cast<Managed*>(m)->get(n, &hasProperty); + static_cast<Object *>(const_cast<Managed*>(m))->get(n, &hasProperty); return hasProperty ? Attr_Data : Attr_Invalid; } |