aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2014-04-30 20:50:42 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2014-07-22 13:49:10 +0200
commitd44cac4028df512b37b161e9f3fc9f7ba1c504bc (patch)
tree2ac4f9c95095863928faf450d9e48d1b3c7c7d87 /src/qml/qml
parent38b58be83a5cbc65f9c3d7e3d14788e7d6837d7d (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/qml')
-rw-r--r--src/qml/qml/qqmlcomponent.cpp2
-rw-r--r--src/qml/qml/qqmlcontextwrapper_p.h4
-rw-r--r--src/qml/qml/qqmllistwrapper_p.h2
-rw-r--r--src/qml/qml/qqmllocale_p.h2
-rw-r--r--src/qml/qml/qqmltypewrapper_p.h2
-rw-r--r--src/qml/qml/qqmlvaluetypewrapper_p.h2
-rw-r--r--src/qml/qml/qqmlxmlhttprequest.cpp12
-rw-r--r--src/qml/qml/v8/qqmlbuiltinfunctions_p.h4
8 files changed, 15 insertions, 15 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index e46377205d..b739b756e2 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -1093,7 +1093,7 @@ class QmlIncubatorObject : public QV4::Object
QV4::Value statusChanged;
} __data;
- V4_OBJECT_NEW
+ V4_OBJECT
public:
QmlIncubatorObject(QV8Engine *engine, QQmlIncubator::IncubationMode = QQmlIncubator::Asynchronous);
diff --git a/src/qml/qml/qqmlcontextwrapper_p.h b/src/qml/qml/qqmlcontextwrapper_p.h
index 31716fe672..2b2a19e253 100644
--- a/src/qml/qml/qqmlcontextwrapper_p.h
+++ b/src/qml/qml/qqmlcontextwrapper_p.h
@@ -92,7 +92,7 @@ struct Q_QML_EXPORT QmlContextWrapper : Object
QQmlIdObjectsArray *idObjectsWrapper;
} __data;
- V4_OBJECT_NEW
+ V4_OBJECT
QmlContextWrapper(QV8Engine *engine, QQmlContextData *context, QObject *scopeObject, bool ownsContext = false);
~QmlContextWrapper();
@@ -129,7 +129,7 @@ struct QQmlIdObjectsArray : public Object
QmlContextWrapper *contextWrapper;
} __data;
- V4_OBJECT_NEW
+ V4_OBJECT
QQmlIdObjectsArray(ExecutionEngine *engine, QmlContextWrapper *contextWrapper);
static ReturnedValue getIndexed(Managed *m, uint index, bool *hasProperty);
diff --git a/src/qml/qml/qqmllistwrapper_p.h b/src/qml/qml/qqmllistwrapper_p.h
index b992df6d7e..3369902525 100644
--- a/src/qml/qml/qqmllistwrapper_p.h
+++ b/src/qml/qml/qqmllistwrapper_p.h
@@ -82,7 +82,7 @@ struct Q_QML_EXPORT QmlListWrapper : Object
int propertyType;
} __data;
- V4_OBJECT_NEW
+ V4_OBJECT
protected:
QmlListWrapper(QV8Engine *engine);
~QmlListWrapper();
diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h
index 5e095a7e06..9d6a9d939c 100644
--- a/src/qml/qml/qqmllocale_p.h
+++ b/src/qml/qml/qqmllocale_p.h
@@ -138,7 +138,7 @@ class QQmlLocaleData : public QV4::Object
QLocale locale;
} __data;
- V4_OBJECT_NEW
+ V4_OBJECT
public:
QQmlLocaleData(QV4::ExecutionEngine *engine)
: QV4::Object(engine)
diff --git a/src/qml/qml/qqmltypewrapper_p.h b/src/qml/qml/qqmltypewrapper_p.h
index aaf35bdcd9..8aa9b01f5a 100644
--- a/src/qml/qml/qqmltypewrapper_p.h
+++ b/src/qml/qml/qqmltypewrapper_p.h
@@ -89,7 +89,7 @@ struct Q_QML_EXPORT QmlTypeWrapper : Object
const void *importNamespace;
} __data;
- V4_OBJECT_NEW
+ V4_OBJECT
private:
QmlTypeWrapper(QV8Engine *engine);
~QmlTypeWrapper();
diff --git a/src/qml/qml/qqmlvaluetypewrapper_p.h b/src/qml/qml/qqmlvaluetypewrapper_p.h
index a7ed8e6ef1..3b52d3e6cd 100644
--- a/src/qml/qml/qqmlvaluetypewrapper_p.h
+++ b/src/qml/qml/qqmlvaluetypewrapper_p.h
@@ -80,7 +80,7 @@ struct Q_QML_EXPORT QmlValueTypeWrapper : Object
mutable QQmlValueType *type;
} __data;
- V4_OBJECT_NEW
+ V4_OBJECT
protected:
QmlValueTypeWrapper(QV8Engine *engine, ObjectType type);
~QmlValueTypeWrapper();
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp
index 0cf367a57d..2818a178d2 100644
--- a/src/qml/qml/qqmlxmlhttprequest.cpp
+++ b/src/qml/qml/qqmlxmlhttprequest.cpp
@@ -195,7 +195,7 @@ public:
NodeImpl *d;
} __data;
- V4_OBJECT_NEW
+ V4_OBJECT
NamedNodeMap(ExecutionEngine *engine, NodeImpl *data, const QList<NodeImpl *> &list)
: Object(engine)
@@ -234,7 +234,7 @@ class NodeList : public Object
NodeImpl *d;
} __data;
- V4_OBJECT_NEW
+ V4_OBJECT
public:
NodeList(ExecutionEngine *engine, NodeImpl *data)
: Object(engine)
@@ -266,7 +266,7 @@ DEFINE_OBJECT_VTABLE(NodeList);
class NodePrototype : public Object
{
- V4_OBJECT_NEW
+ V4_OBJECT
public:
NodePrototype(ExecutionEngine *engine)
: Object(engine)
@@ -325,7 +325,7 @@ class Node : public Object
struct {
NodeImpl *d;
} __data;
- V4_OBJECT_NEW
+ V4_OBJECT
Node(ExecutionEngine *engine, NodeImpl *data)
: Object(engine)
@@ -1632,7 +1632,7 @@ struct QQmlXMLHttpRequestWrapper : public Object
QQmlXMLHttpRequest *request;
} __data;
- V4_OBJECT_NEW
+ V4_OBJECT
QQmlXMLHttpRequestWrapper(ExecutionEngine *engine, QQmlXMLHttpRequest *request)
: Object(engine)
{
@@ -1659,7 +1659,7 @@ struct QQmlXMLHttpRequestCtor : public FunctionObject
Object *proto;
} __data;
- V4_OBJECT_NEW
+ V4_OBJECT
QQmlXMLHttpRequestCtor(ExecutionEngine *engine)
: FunctionObject(engine->rootContext, QStringLiteral("XMLHttpRequest"))
{
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
index b74e100349..0176bf05e2 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
@@ -74,7 +74,7 @@ struct QtObject : Object
QObject *application;
} __data;
- V4_OBJECT_NEW
+ V4_OBJECT
QtObject(ExecutionEngine *v4, QQmlEngine *qmlEngine);
@@ -164,7 +164,7 @@ struct QQmlBindingFunction : public QV4::FunctionObject
QQmlSourceLocation bindingLocation;
} __data;
- V4_OBJECT_NEW
+ V4_OBJECT
QQmlBindingFunction(FunctionObject *originalFunction);
void initBindingLocation(); // from caller stack trace