Rename V4_MANAGED_NEW back to V4_MANAGED

Change-Id: I3d68fdf38bb2d42f70cbb1297a88eeb8d9316911
Reviewed-by: Simon Hausmann <[email protected]>

4 files changed, 26 insertions, 38 deletions

diff --git a/src/qml/jsruntime/qv4context_p.h b/src/qml/jsruntime/qv4context_p.h
index 2a6360ec39..a713a38141 100644
--- a/src/qml/jsruntime/qv4context_p.h
+++ b/src/qml/jsruntime/qv4context_p.h
@@ -119,7 +119,7 @@ struct Q_QML_EXPORT ExecutionContext : public Managed
         int lineNumber;
     } __data;
 
-    V4_MANAGED_NEW
+    V4_MANAGED
     Q_MANAGED_TYPE(ExecutionContext)
 
     ExecutionContext(ExecutionEngine *engine, ContextType t)
@@ -209,7 +209,7 @@ struct GlobalContext : public ExecutionContext
     struct {
         Object *global;
     } __data;
-    V4_MANAGED_NEW
+    V4_MANAGED
 
     GlobalContext(ExecutionEngine *engine);
 };
@@ -224,7 +224,7 @@ struct CatchContext : public ExecutionContext
         StringValue exceptionVarName;
         Value exceptionValue;
     } __data;
-    V4_MANAGED_NEW
+    V4_MANAGED
 
     CatchContext(ExecutionEngine *engine, const StringRef exceptionVarName, const ValueRef exceptionValue);
 };
@@ -237,7 +237,7 @@ struct WithContext : public ExecutionContext
     struct {
         Object *withObject;
     } __data;
-    V4_MANAGED_NEW
+    V4_MANAGED
 
     WithContext(ExecutionEngine *engine, ObjectRef with);
 };
diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h
index 3f16b0784a..69e08bdab3 100644
--- a/src/qml/jsruntime/qv4managed_p.h
+++ b/src/qml/jsruntime/qv4managed_p.h
@@ -69,14 +69,6 @@ inline void qYouForgotTheQ_MANAGED_Macro(T1, T2) {}
         static inline const QV4::ManagedVTable *staticVTable() { return &static_vtbl; } \
         template <typename T> \
         QV4::Returned<T> *asReturned() { return QV4::Returned<T>::create(this); } \
-
-#define V4_MANAGED_NEW \
-    public: \
-        Q_MANAGED_CHECK \
-        static const QV4::ManagedVTable static_vtbl; \
-        static inline const QV4::ManagedVTable *staticVTable() { return &static_vtbl; } \
-        template <typename T> \
-        QV4::Returned<T> *asReturned() { return QV4::Returned<T>::create(this); } \
         void __dataTest() { Q_STATIC_ASSERT(sizeof(*this) == sizeof(Data)); } \
         const Data *d() const { return &static_cast<const Data &>(Managed::data); } \
         Data *d() { return &static_cast<Data &>(Managed::data); }
@@ -186,6 +178,26 @@ const QV4::ObjectVTable classname::static_vtbl =    \
 
 struct Q_QML_PRIVATE_EXPORT Managed
 {
+    struct Data {
+        InternalClass *internalClass;
+        union {
+            uint _data;
+            struct {
+                uchar markBit :  1;
+                uchar inUse   :  1;
+                uchar extensible : 1; // used by Object
+                uchar _unused : 1;
+                uchar needsActivation : 1; // used by FunctionObject
+                uchar strictMode : 1; // used by FunctionObject
+                uchar bindingKeyFlag : 1;
+                uchar hasAccessorProperty : 1;
+                uchar _type;
+                mutable uchar subtype;
+                uchar _flags;
+            };
+        };
+    };
+    Data data;
     V4_MANAGED
     enum {
         IsExecutionContext = false,
@@ -300,30 +312,6 @@ public:
 
     ReturnedValue asReturnedValue() { return Value::fromManaged(this).asReturnedValue(); }
 
-    struct Data {
-        InternalClass *internalClass;
-        union {
-            uint _data;
-            struct {
-                uchar markBit :  1;
-                uchar inUse   :  1;
-                uchar extensible : 1; // used by Object
-                uchar _unused : 1;
-                uchar needsActivation : 1; // used by FunctionObject
-                uchar strictMode : 1; // used by FunctionObject
-                uchar bindingKeyFlag : 1;
-                uchar hasAccessorProperty : 1;
-                uchar _type;
-                mutable uchar subtype;
-                uchar _flags;
-            };
-        };
-    };
-    Data data;
-
-    Data *d() { return &data; }
-    const Data *d() const { return &data; }
-
     InternalClass *internalClass() const { return d()->internalClass; }
     void setInternalClass(InternalClass *ic) { d()->internalClass = ic; }
 
diff --git a/src/qml/jsruntime/qv4memberdata_p.h b/src/qml/jsruntime/qv4memberdata_p.h
index 5f63be84b4..41e026077d 100644
--- a/src/qml/jsruntime/qv4memberdata_p.h
+++ b/src/qml/jsruntime/qv4memberdata_p.h
@@ -59,7 +59,7 @@ struct MemberData : Managed
         Value data[1];
     } __data;
 
-    V4_MANAGED_NEW
+    V4_MANAGED
 
     MemberData(QV4::InternalClass *ic) : Managed(ic) {}
     Value &operator[] (uint idx) { return d()->data[idx]; }
diff --git a/src/qml/jsruntime/qv4regexp_p.h b/src/qml/jsruntime/qv4regexp_p.h
index 15086181a2..983fd03351 100644
--- a/src/qml/jsruntime/qv4regexp_p.h
+++ b/src/qml/jsruntime/qv4regexp_p.h
@@ -115,7 +115,7 @@ class RegExp : public Managed
         bool ignoreCase;
         bool multiLine;
     } __data;
-    V4_MANAGED_NEW
+    V4_MANAGED
     Q_MANAGED_TYPE(RegExp)