aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/imports/localstorage/plugin.cpp2
-rw-r--r--src/qml/qml/qqmlboundsignal.cpp2
-rw-r--r--src/qml/qml/qqmlcomponent.cpp10
-rw-r--r--src/qml/qml/qqmlvmemetaobject.cpp2
-rw-r--r--src/qml/qml/qqmlxmlhttprequest.cpp26
-rw-r--r--src/qml/qml/v4/qv4v8.cpp7
-rw-r--r--src/qml/qml/v4/qv4v8_p.h1
-rw-r--r--src/qml/qml/v8/qqmlbuiltinfunctions.cpp20
-rw-r--r--src/qml/qml/v8/qv8listwrapper.cpp2
-rw-r--r--src/qml/qml/v8/qv8qobjectwrapper.cpp2
-rw-r--r--src/qml/qml/v8/qv8worker.cpp2
-rw-r--r--src/qmltest/quicktestresult.cpp2
-rw-r--r--src/quick/items/context2d/qquickcanvasitem.cpp14
-rw-r--r--src/quick/items/context2d/qquickcontext2d.cpp2
14 files changed, 43 insertions, 51 deletions
diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp
index d1aaafc9aa..7e4b805ad6 100644
--- a/src/imports/localstorage/plugin.cpp
+++ b/src/imports/localstorage/plugin.cpp
@@ -200,7 +200,7 @@ static v8::Handle<v8::Value> qmlsqldatabase_rows_index(QV8SqlDatabaseResource *r
for (int ii = 0; ii < record.count(); ++ii) {
QVariant v = record.value(ii);
if (v.isNull()) {
- row->Set(r->engine->toString(record.fieldName(ii)), v8::Null());
+ row->Set(r->engine->toString(record.fieldName(ii)), QV4::Value::nullValue());
} else {
row->Set(r->engine->toString(record.fieldName(ii)),
r->engine->fromVariant(v));
diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp
index 3e952c6458..683f5280d0 100644
--- a/src/qml/qml/qqmlboundsignal.cpp
+++ b/src/qml/qml/qqmlboundsignal.cpp
@@ -243,7 +243,7 @@ void QQmlBoundSignalExpression::evaluate(void **a)
args[ii] = reinterpret_cast<QQmlV4Handle *>(a[ii + 1])->toV8Handle();
} else if (ep->isQObject(type)) {
if (!*reinterpret_cast<void* const *>(a[ii + 1]))
- args[ii] = v8::Null();
+ args[ii] = QV4::Value::nullValue();
else
args[ii] = engine->newQObject(*reinterpret_cast<QObject* const *>(a[ii + 1]));
} else {
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index 6709ea6274..2747cc72fc 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -1193,7 +1193,7 @@ void QQmlComponent::createObject(QQmlV8Function *args)
v8::Handle<v8::Value> v = (*args)[1];
if (!v->IsObject() || v->IsArray()) {
qmlInfo(this) << tr("createObject: value is not an object");
- args->returnValue(v8::Null());
+ args->returnValue(QV4::Value::nullValue());
return;
}
valuemap = v8::Handle<v8::Object>::Cast(v);
@@ -1208,7 +1208,7 @@ void QQmlComponent::createObject(QQmlV8Function *args)
QObject *rv = beginCreate(ctxt);
if (!rv) {
- args->returnValue(v8::Null());
+ args->returnValue(QV4::Value::nullValue());
return;
}
@@ -1232,7 +1232,7 @@ void QQmlComponent::createObject(QQmlV8Function *args)
QQmlData::get(rv)->indestructible = false;
if (!rv)
- args->returnValue(v8::Null());
+ args->returnValue(QV4::Value::nullValue());
else
args->returnValue(object);
}
@@ -1315,7 +1315,7 @@ void QQmlComponent::incubateObject(QQmlV8Function *args)
if (v->IsNull()) {
} else if (!v->IsObject() || v->IsArray()) {
qmlInfo(this) << tr("createObject: value is not an object");
- args->returnValue(v8::Null());
+ args->returnValue(QV4::Value::nullValue());
return;
} else {
valuemap = v8::Handle<v8::Object>::Cast(v);
@@ -1347,7 +1347,7 @@ void QQmlComponent::incubateObject(QQmlV8Function *args)
if (r->status() == QQmlIncubator::Null) {
r->dispose();
- args->returnValue(v8::Null());
+ args->returnValue(QV4::Value::nullValue());
} else {
args->returnValue(o);
}
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp
index 1f5d88e9b5..6fc9579503 100644
--- a/src/qml/qml/qqmlvmemetaobject.cpp
+++ b/src/qml/qml/qqmlvmemetaobject.cpp
@@ -69,7 +69,7 @@ void QQmlVMEVariantQObjectPtr::objectDestroyed(QObject *)
if (m_target && m_index >= 0) {
if (m_isVar && m_target->varPropertiesInitialized && !m_target->varProperties.IsEmpty()) {
// Set the var property to NULL
- m_target->varProperties->Set(m_index - m_target->firstVarPropertyIndex, v8::Null());
+ m_target->varProperties->Set(m_index - m_target->firstVarPropertyIndex, QV4::Value::nullValue());
}
m_target->activate(m_target->object, m_target->methodOffset() + m_index, 0);
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp
index a28e96ec29..46ffbb46f8 100644
--- a/src/qml/qml/qqmlxmlhttprequest.cpp
+++ b/src/qml/qml/qqmlxmlhttprequest.cpp
@@ -391,7 +391,7 @@ v8::Handle<v8::Value> Node::nodeValue(v8::Handle<v8::String>, const v8::Accessor
r->d->type == NodeImpl::Entity ||
r->d->type == NodeImpl::EntityReference ||
r->d->type == NodeImpl::Notation)
- return v8::Null();
+ return QV4::Value::nullValue();
return engine->toString(r->d->data);
}
@@ -410,7 +410,7 @@ v8::Handle<v8::Value> Node::parentNode(v8::Handle<v8::String>, const v8::Accesso
QV8Engine *engine = V8ENGINE();
if (r->d->parent) return Node::create(engine, r->d->parent);
- else return v8::Null();
+ else return QV4::Value::nullValue();
}
v8::Handle<v8::Value> Node::childNodes(v8::Handle<v8::String>, const v8::AccessorInfo &args)
@@ -428,7 +428,7 @@ v8::Handle<v8::Value> Node::firstChild(v8::Handle<v8::String>, const v8::Accesso
if (!r) return QV4::Value::undefinedValue();
QV8Engine *engine = V8ENGINE();
- if (r->d->children.isEmpty()) return v8::Null();
+ if (r->d->children.isEmpty()) return QV4::Value::nullValue();
else return Node::create(engine, r->d->children.first());
}
@@ -438,7 +438,7 @@ v8::Handle<v8::Value> Node::lastChild(v8::Handle<v8::String>, const v8::Accessor
if (!r) return QV4::Value::undefinedValue();
QV8Engine *engine = V8ENGINE();
- if (r->d->children.isEmpty()) return v8::Null();
+ if (r->d->children.isEmpty()) return QV4::Value::nullValue();
else return Node::create(engine, r->d->children.last());
}
@@ -448,16 +448,16 @@ v8::Handle<v8::Value> Node::previousSibling(v8::Handle<v8::String>, const v8::Ac
if (!r) return QV4::Value::undefinedValue();
QV8Engine *engine = V8ENGINE();
- if (!r->d->parent) return v8::Null();
+ if (!r->d->parent) return QV4::Value::nullValue();
for (int ii = 0; ii < r->d->parent->children.count(); ++ii) {
if (r->d->parent->children.at(ii) == r->d) {
- if (ii == 0) return v8::Null();
+ if (ii == 0) return QV4::Value::nullValue();
else return Node::create(engine, r->d->parent->children.at(ii - 1));
}
}
- return v8::Null();
+ return QV4::Value::nullValue();
}
v8::Handle<v8::Value> Node::nextSibling(v8::Handle<v8::String>, const v8::AccessorInfo &args)
@@ -466,16 +466,16 @@ v8::Handle<v8::Value> Node::nextSibling(v8::Handle<v8::String>, const v8::Access
if (!r) return QV4::Value::undefinedValue();
QV8Engine *engine = V8ENGINE();
- if (!r->d->parent) return v8::Null();
+ if (!r->d->parent) return QV4::Value::nullValue();
for (int ii = 0; ii < r->d->parent->children.count(); ++ii) {
if (r->d->parent->children.at(ii) == r->d) {
- if ((ii + 1) == r->d->parent->children.count()) return v8::Null();
+ if ((ii + 1) == r->d->parent->children.count()) return QV4::Value::nullValue();
else return Node::create(engine, r->d->parent->children.at(ii + 1));
}
}
- return v8::Null();
+ return QV4::Value::nullValue();
}
v8::Handle<v8::Value> Node::attributes(v8::Handle<v8::String>, const v8::AccessorInfo &args)
@@ -485,7 +485,7 @@ v8::Handle<v8::Value> Node::attributes(v8::Handle<v8::String>, const v8::Accesso
QV8Engine *engine = V8ENGINE();
if (r->d->type != NodeImpl::Element)
- return v8::Null();
+ return QV4::Value::nullValue();
else
return NamedNodeMap::create(engine, r->d, &r->d->attributes);
}
@@ -779,7 +779,7 @@ v8::Handle<v8::Value> Document::load(QV8Engine *engine, const QByteArray &data)
if (!document || reader.hasError()) {
if (document) D(document);
- return v8::Null();
+ return QV4::Value::nullValue();
}
v8::Handle<v8::Object> instance = xhrdata(engine)->newNode();
@@ -1744,7 +1744,7 @@ static v8::Handle<v8::Value> qmlxmlhttprequest_responseXML(v8::Handle<v8::String
if (!r->receivedXml() ||
(r->readyState() != QQmlXMLHttpRequest::Loading &&
r->readyState() != QQmlXMLHttpRequest::Done)) {
- return v8::Null();
+ return QV4::Value::nullValue();
} else {
return Document::load(r->engine, r->rawResponseBody());
}
diff --git a/src/qml/qml/v4/qv4v8.cpp b/src/qml/qml/v4/qv4v8.cpp
index a7e8436a4a..b41e3722fe 100644
--- a/src/qml/qml/v4/qv4v8.cpp
+++ b/src/qml/qml/v4/qv4v8.cpp
@@ -1822,13 +1822,6 @@ ObjectTemplate::ObjectTemplate()
m_useUserComparison = false;
}
-Handle<Primitive> Null()
-{
- Handle<Primitive> val;
- val.val = QV4::Value::nullValue().val;
- return val;
-}
-
Handle<Boolean> True()
{
Handle<Primitive> val;
diff --git a/src/qml/qml/v4/qv4v8_p.h b/src/qml/qml/v4/qv4v8_p.h
index 3f10d2f9be..2135258e09 100644
--- a/src/qml/qml/v4/qv4v8_p.h
+++ b/src/qml/qml/v4/qv4v8_p.h
@@ -2022,7 +2022,6 @@ DEFINE_REFCOUNTED_HANDLE_OPERATIONS(ObjectTemplate)
// --- Statics ---
-Handle<Primitive> V8EXPORT Null();
Handle<Boolean> V8EXPORT True();
Handle<Boolean> V8EXPORT False();
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index a02ecf5726..81f013d364 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -703,10 +703,10 @@ v8::Handle<v8::Value> lighter(const v8::Arguments &args)
bool ok = false;
v = QQmlStringConverters::colorFromString(v.toString(), &ok);
if (!ok) {
- return v8::Null();
+ return QV4::Value::nullValue();
}
} else if (v.userType() != QVariant::Color) {
- return v8::Null();
+ return QV4::Value::nullValue();
}
qreal factor = 1.5;
@@ -741,10 +741,10 @@ v8::Handle<v8::Value> darker(const v8::Arguments &args)
bool ok = false;
v = QQmlStringConverters::colorFromString(v.toString(), &ok);
if (!ok) {
- return v8::Null();
+ return QV4::Value::nullValue();
}
} else if (v.userType() != QVariant::Color) {
- return v8::Null();
+ return QV4::Value::nullValue();
}
qreal factor = 2.0;
@@ -789,10 +789,10 @@ v8::Handle<v8::Value> tint(const v8::Arguments &args)
bool ok = false;
v1 = QQmlStringConverters::colorFromString(v1.toString(), &ok);
if (!ok) {
- return v8::Null();
+ return QV4::Value::nullValue();
}
} else if (v1.userType() != QVariant::Color) {
- return v8::Null();
+ return QV4::Value::nullValue();
}
// tint color
@@ -801,10 +801,10 @@ v8::Handle<v8::Value> tint(const v8::Arguments &args)
bool ok = false;
v2 = QQmlStringConverters::colorFromString(v2.toString(), &ok);
if (!ok) {
- return v8::Null();
+ return QV4::Value::nullValue();
}
} else if (v2.userType() != QVariant::Color) {
- return v8::Null();
+ return QV4::Value::nullValue();
}
return V8ENGINE()->fromVariant(QQml_colorProvider()->tint(v1, v2));
@@ -1181,7 +1181,7 @@ v8::Handle<v8::Value> createQmlObject(const v8::Arguments &args)
QString qml = args[0]->v4Value().toQString();
if (qml.isEmpty())
- return v8::Null();
+ return QV4::Value::nullValue();
QUrl url;
if (args.Length() > 2)
@@ -1282,7 +1282,7 @@ v8::Handle<v8::Value> createComponent(const v8::Arguments &args)
QString arg = args[0]->v4Value().toQString();
if (arg.isEmpty())
- return v8::Null();
+ return QV4::Value::nullValue();
QQmlComponent::CompilationMode compileMode = QQmlComponent::PreferSynchronous;
QObject *parentArg = 0;
diff --git a/src/qml/qml/v8/qv8listwrapper.cpp b/src/qml/qml/v8/qv8listwrapper.cpp
index 7ad590aff2..8dc357606f 100644
--- a/src/qml/qml/v8/qv8listwrapper.cpp
+++ b/src/qml/qml/v8/qv8listwrapper.cpp
@@ -86,7 +86,7 @@ void QV8ListWrapper::destroy()
v8::Handle<v8::Value> QV8ListWrapper::newList(QObject *object, int propId, int propType)
{
if (!object || propId == -1)
- return v8::Null();
+ return QV4::Value::nullValue();
// XXX NewInstance() should be optimized
v8::Handle<v8::Object> rv = m_constructor->NewInstance();
diff --git a/src/qml/qml/v8/qv8qobjectwrapper.cpp b/src/qml/qml/v8/qv8qobjectwrapper.cpp
index 81668494d6..e58584b9ca 100644
--- a/src/qml/qml/v8/qv8qobjectwrapper.cpp
+++ b/src/qml/qml/v8/qv8qobjectwrapper.cpp
@@ -1095,7 +1095,7 @@ released the handle.
v8::Handle<v8::Value> QV8QObjectWrapper::newQObject(QObject *object)
{
if (QQmlData::wasDeleted(object))
- return v8::Null();
+ return QV4::Value::nullValue();
QQmlData *ddata = QQmlData::get(object, true);
if (!ddata)
diff --git a/src/qml/qml/v8/qv8worker.cpp b/src/qml/qml/v8/qv8worker.cpp
index 1bbe4779fc..9986cee3c6 100644
--- a/src/qml/qml/v8/qv8worker.cpp
+++ b/src/qml/qml/v8/qv8worker.cpp
@@ -295,7 +295,7 @@ v8::Handle<v8::Value> QV8Worker::deserialize(const char *&data, QV8Engine *engin
case WorkerUndefined:
return QV4::Value::undefinedValue();
case WorkerNull:
- return v8::Null();
+ return QV4::Value::nullValue();
case WorkerTrue:
return v8::True();
case WorkerFalse:
diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp
index 35091f8a59..507ac4156f 100644
--- a/src/qmltest/quicktestresult.cpp
+++ b/src/qmltest/quicktestresult.cpp
@@ -475,7 +475,7 @@ bool QuickTestResult::fuzzyCompare(const QVariant &actual, const QVariant &expec
void QuickTestResult::stringify(QQmlV8Function *args)
{
if (args->Length() < 1)
- args->returnValue(v8::Null());
+ args->returnValue(QV4::Value::nullValue());
v8::Handle<v8::Value> value = (*args)[0];
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index f810c761dc..f05db38623 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -368,7 +368,7 @@ QQmlV4Handle QQuickCanvasItem::context() const
if (d->contextInitialized)
return QQmlV4Handle::fromV8Handle(d->context->v8value());
- return QQmlV4Handle::fromV8Handle(v8::Null());
+ return QQmlV4Handle::fromV8Handle(QV4::Value::nullValue());
}
/*!
@@ -728,13 +728,13 @@ void QQuickCanvasItem::getContext(QQmlV8Function *args)
if (args->Length() < 1 || !(*args)[0]->IsString()) {
qmlInfo(this) << "getContext should be called with a string naming the required context type";
- args->returnValue(v8::Null());
+ args->returnValue(QV4::Value::nullValue());
return;
}
if (!d->available) {
qmlInfo(this) << "Unable to use getContext() at this time, please wait for available: true";
- args->returnValue(v8::Null());
+ args->returnValue(QV4::Value::nullValue());
return;
}
@@ -747,14 +747,14 @@ void QQuickCanvasItem::getContext(QQmlV8Function *args)
}
qmlInfo(this) << "Canvas already initialized with a different context type";
- args->returnValue(v8::Null());
+ args->returnValue(QV4::Value::nullValue());
return;
}
if (createContext(contextId))
args->returnValue(d->context->v8value());
else
- args->returnValue(v8::Null());
+ args->returnValue(QV4::Value::nullValue());
}
/*!
@@ -768,7 +768,7 @@ void QQuickCanvasItem::requestAnimationFrame(QQmlV8Function *args)
{
if (args->Length() < 1 || !(*args)[0]->IsFunction()) {
qmlInfo(this) << "requestAnimationFrame should be called with an animation callback function";
- args->returnValue(v8::Null());
+ args->returnValue(QV4::Value::nullValue());
return;
}
@@ -794,7 +794,7 @@ void QQuickCanvasItem::cancelRequestAnimationFrame(QQmlV8Function *args)
{
if (args->Length() < 1 || !(*args)[0]->IsInt32()) {
qmlInfo(this) << "cancelRequestAnimationFrame should be called with an animation callback id";
- args->returnValue(v8::Null());
+ args->returnValue(QV4::Value::nullValue());
return;
}
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index 1dadac8ba9..8bf44a2077 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -2596,7 +2596,7 @@ static v8::Handle<v8::Value> ctx2d_getImageData(const v8::Arguments &args)
return imageData;
}
- return v8::Null();
+ return QV4::Value::nullValue();
}
/*!
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 09:20:55 +0000