summaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
Diffstat (limited to 'src/script')
-rw-r--r--src/script/api/qscriptclass.cpp4
-rw-r--r--src/script/api/qscriptengine.cpp4
-rw-r--r--src/script/api/qscriptengine_p.h2
-rw-r--r--src/script/api/qscriptvalue.cpp4
-rw-r--r--src/script/api/qscriptvalueiterator.cpp2
-rw-r--r--src/script/bridge/qscriptdeclarativeclass.cpp4
6 files changed, 10 insertions, 10 deletions
diff --git a/src/script/api/qscriptclass.cpp b/src/script/api/qscriptclass.cpp
index bd7c452..1ff6da0 100644
--- a/src/script/api/qscriptclass.cpp
+++ b/src/script/api/qscriptclass.cpp
@@ -236,7 +236,7 @@ QScriptClass::QueryFlags QScriptClass::queryProperty(
Q_UNUSED(name);
Q_UNUSED(flags);
Q_UNUSED(id);
- return 0;
+ return {};
}
/*!
@@ -276,7 +276,7 @@ QScriptValue::PropertyFlags QScriptClass::propertyFlags(
Q_UNUSED(object);
Q_UNUSED(name);
Q_UNUSED(id);
- return 0;
+ return {};
}
/*!
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index ec5e1ff..40ba46c 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -1990,9 +1990,9 @@ QScriptValue::PropertyFlags QScriptEnginePrivate::propertyFlags(JSC::ExecState *
JSC::JSValue proto = object->prototype();
return propertyFlags(exec, proto, id, mode);
}
- return 0;
+ return {};
}
- QScriptValue::PropertyFlags result = 0;
+ QScriptValue::PropertyFlags result;
if (attribs & JSC::ReadOnly)
result |= QScriptValue::ReadOnly;
if (attribs & JSC::DontEnum)
diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h
index a71bbc5..84821c4 100644
--- a/src/script/api/qscriptengine_p.h
+++ b/src/script/api/qscriptengine_p.h
@@ -329,7 +329,7 @@ public:
void markQObjectData(JSC::MarkStack&);
JSC::JSValue newQObject(QObject *object,
QScriptEngine::ValueOwnership ownership = QScriptEngine::QtOwnership,
- const QScriptEngine:: QObjectWrapOptions &options = 0);
+ const QScriptEngine:: QObjectWrapOptions &options = {});
JSC::JSValue newQMetaObject(const QMetaObject *metaObject,
JSC::JSValue ctor);
diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp
index 48d34cf..7569064 100644
--- a/src/script/api/qscriptvalue.cpp
+++ b/src/script/api/qscriptvalue.cpp
@@ -1507,7 +1507,7 @@ QScriptValue::PropertyFlags QScriptValue::propertyFlags(const QString &name,
{
Q_D(const QScriptValue);
if (!d || !d->isObject())
- return 0;
+ return {};
QScript::APIShim shim(d->engine);
JSC::ExecState *exec = d->engine->currentFrame;
return d->propertyFlags(JSC::Identifier(exec, name), mode);
@@ -1527,7 +1527,7 @@ QScriptValue::PropertyFlags QScriptValue::propertyFlags(const QScriptString &nam
{
Q_D(const QScriptValue);
if (!d || !d->isObject() || !QScriptStringPrivate::isValid(name))
- return 0;
+ return {};
return d->propertyFlags(name.d_ptr->identifier, mode);
}
diff --git a/src/script/api/qscriptvalueiterator.cpp b/src/script/api/qscriptvalueiterator.cpp
index a1e3b21..8a038f5 100644
--- a/src/script/api/qscriptvalueiterator.cpp
+++ b/src/script/api/qscriptvalueiterator.cpp
@@ -323,7 +323,7 @@ QScriptValue::PropertyFlags QScriptValueIterator::flags() const
{
Q_D(const QScriptValueIterator);
if (!d || !d->initialized || !d->engine())
- return 0;
+ return {};
QScript::APIShim shim(d->engine());
return d->object()->propertyFlags(*d->current);
}
diff --git a/src/script/bridge/qscriptdeclarativeclass.cpp b/src/script/bridge/qscriptdeclarativeclass.cpp
index 1149c4f..11b3caa 100644
--- a/src/script/bridge/qscriptdeclarativeclass.cpp
+++ b/src/script/bridge/qscriptdeclarativeclass.cpp
@@ -487,7 +487,7 @@ QScriptDeclarativeClass::queryProperty(Object *object, const Identifier &name,
Q_UNUSED(object);
Q_UNUSED(name);
Q_UNUSED(flags);
- return 0;
+ return {};
}
QScriptDeclarativeClass::Value
@@ -511,7 +511,7 @@ QScriptDeclarativeClass::propertyFlags(Object *object, const Identifier &name)
{
Q_UNUSED(object);
Q_UNUSED(name);
- return 0;
+ return {};
}
QScriptDeclarativeClass::Value QScriptDeclarativeClass::call(Object *object,