From 65ec0ab2e432139a2befe887ed9af4603ee1ae03 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 20 Jan 2014 11:43:25 +0100 Subject: Reorder members in ManagedVTable This is to prepare splitting it up into a several type dependent vtables. Change-Id: I5de8234e40ffc73fab47d43f4a1b30d244fc6ad9 Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4context.cpp | 8 ++++---- src/qml/jsruntime/qv4managed.cpp | 8 ++++---- src/qml/jsruntime/qv4managed_p.h | 30 +++++++++++++++--------------- src/qml/jsruntime/qv4string.cpp | 6 +++--- 4 files changed, 26 insertions(+), 26 deletions(-) (limited to 'src') diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp index f808a5791f..c2369daf83 100644 --- a/src/qml/jsruntime/qv4context.cpp +++ b/src/qml/jsruntime/qv4context.cpp @@ -60,10 +60,11 @@ const ManagedVTable ExecutionContext::static_vtbl = ExecutionContext::IsErrorObject, 0, ExecutionContext::MyType, + "ExecutionContext", + destroy, + markObjects, call, construct, - markObjects, - destroy, 0 /*collectDeletables*/, 0, 0, @@ -77,8 +78,7 @@ const ManagedVTable ExecutionContext::static_vtbl = 0, isEqualTo, 0, - 0, - "ExecutionContext", + 0 }; CallContext *ExecutionContext::newCallContext(FunctionObject *function, CallData *callData) diff --git a/src/qml/jsruntime/qv4managed.cpp b/src/qml/jsruntime/qv4managed.cpp index 60f6b7dbab..ec349702d6 100644 --- a/src/qml/jsruntime/qv4managed.cpp +++ b/src/qml/jsruntime/qv4managed.cpp @@ -54,10 +54,11 @@ const ManagedVTable Managed::static_vtbl = Managed::IsErrorObject, 0, Managed::MyType, + "Managed", + destroy, + 0 /*markObjects*/, call, construct, - 0 /*markObjects*/, - destroy, 0 /*collectDeletables*/, 0, 0, @@ -71,8 +72,7 @@ const ManagedVTable Managed::static_vtbl = 0, isEqualTo, 0, - 0, - "Managed", + 0 }; diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h index 89618955eb..6c154c80b5 100644 --- a/src/qml/jsruntime/qv4managed_p.h +++ b/src/qml/jsruntime/qv4managed_p.h @@ -90,10 +90,11 @@ struct ManagedVTable uint isErrorObject : 1; uint unused : 19; uint type : 8; + const char *className; + void (*destroy)(Managed *); + void (*markObjects)(Managed *, ExecutionEngine *e); ReturnedValue (*call)(Managed *, CallData *data); ReturnedValue (*construct)(Managed *, CallData *data); - void (*markObjects)(Managed *, ExecutionEngine *e); - void (*destroy)(Managed *); void (*collectDeletables)(Managed *, GCDeletable **deletable); ReturnedValue (*get)(Managed *, const StringRef name, bool *hasProperty); ReturnedValue (*getIndexed)(Managed *, uint index, bool *hasProperty); @@ -108,7 +109,6 @@ struct ManagedVTable bool (*isEqualTo)(Managed *m, Managed *other); uint (*getLength)(const Managed *m); void (*advanceIterator)(Managed *m, ObjectIterator *it, StringRef name, uint *index, Property *p, PropertyAttributes *attributes); - const char *className; }; #define DEFINE_MANAGED_VTABLE(classname) \ @@ -121,10 +121,11 @@ const QV4::ManagedVTable classname::static_vtbl = \ classname::IsErrorObject, \ 0, \ classname::MyType, \ + #classname, \ + destroy, \ + markObjects, \ call, \ construct, \ - markObjects, \ - destroy, \ 0, \ get, \ getIndexed, \ @@ -138,8 +139,7 @@ const QV4::ManagedVTable classname::static_vtbl = \ setLookup, \ isEqualTo, \ getLength, \ - advanceIterator, \ - #classname \ + advanceIterator \ } #define DEFINE_MANAGED_VTABLE_WITH_NAME(classname, name) \ @@ -152,10 +152,11 @@ const QV4::ManagedVTable classname::static_vtbl = \ classname::IsErrorObject, \ 0, \ classname::MyType, \ + #name, \ + destroy, \ + markObjects, \ call, \ construct, \ - markObjects, \ - destroy, \ 0, \ get, \ getIndexed, \ @@ -169,8 +170,7 @@ const QV4::ManagedVTable classname::static_vtbl = \ setLookup, \ isEqualTo, \ getLength, \ - advanceIterator, \ - #name \ + advanceIterator \ } #define DEFINE_MANAGED_VTABLE_WITH_DELETABLES(classname) \ @@ -183,10 +183,11 @@ const QV4::ManagedVTable classname::static_vtbl = \ classname::IsErrorObject, \ 0, \ classname::MyType, \ + #classname, \ + destroy, \ + markObjects, \ call, \ construct, \ - markObjects, \ - destroy, \ collectDeletables, \ get, \ getIndexed, \ @@ -200,8 +201,7 @@ const QV4::ManagedVTable classname::static_vtbl = \ setLookup, \ isEqualTo, \ getLength, \ - advanceIterator, \ - #classname \ + advanceIterator \ } struct Q_QML_EXPORT Managed diff --git a/src/qml/jsruntime/qv4string.cpp b/src/qml/jsruntime/qv4string.cpp index df48faf601..ead818c8bd 100644 --- a/src/qml/jsruntime/qv4string.cpp +++ b/src/qml/jsruntime/qv4string.cpp @@ -110,10 +110,11 @@ const ManagedVTable String::static_vtbl = String::IsErrorObject, 0, String::MyType, + "String", + destroy, + markObjects, call, construct, - markObjects, - destroy, 0 /*collectDeletables*/, get, getIndexed, @@ -128,7 +129,6 @@ const ManagedVTable String::static_vtbl = isEqualTo, 0, 0 /*advanceIterator*/, - "String", }; void String::destroy(Managed *that) -- cgit v1.2.3