From 8178bd345530f9687d7f4159350b9337615bb3c0 Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Wed, 26 Feb 2020 11:11:06 +0100 Subject: QJSValue: Make call* const (Qt 6 TODO) Change-Id: I3a6c83ffc203bf27121f460ba23d31a39d1493ee Reviewed-by: Ulf Hermann --- src/qml/jsapi/qjsvalue.cpp | 6 +++--- src/qml/jsapi/qjsvalue.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/qml/jsapi') diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp index b40bc1f18b..6e632b56b2 100644 --- a/src/qml/jsapi/qjsvalue.cpp +++ b/src/qml/jsapi/qjsvalue.cpp @@ -742,7 +742,7 @@ QVariant QJSValue::toVariant() const \sa isCallable(), callWithInstance(), callAsConstructor() */ -QJSValue QJSValue::call(const QJSValueList &args) +QJSValue QJSValue::call(const QJSValueList &args) const { QV4::Value *val = QJSValuePrivate::getValue(this); if (!val) @@ -795,7 +795,7 @@ QJSValue QJSValue::call(const QJSValueList &args) \sa call() */ -QJSValue QJSValue::callWithInstance(const QJSValue &instance, const QJSValueList &args) +QJSValue QJSValue::callWithInstance(const QJSValue &instance, const QJSValueList &args) const { QV4::Value *val = QJSValuePrivate::getValue(this); if (!val) @@ -851,7 +851,7 @@ QJSValue QJSValue::callWithInstance(const QJSValue &instance, const QJSValueList \sa call(), QJSEngine::newObject() */ -QJSValue QJSValue::callAsConstructor(const QJSValueList &args) +QJSValue QJSValue::callAsConstructor(const QJSValueList &args) const { QV4::Value *val = QJSValuePrivate::getValue(this); if (!val) diff --git a/src/qml/jsapi/qjsvalue.h b/src/qml/jsapi/qjsvalue.h index 2f95e0ff31..b491080e56 100644 --- a/src/qml/jsapi/qjsvalue.h +++ b/src/qml/jsapi/qjsvalue.h @@ -144,9 +144,9 @@ public: bool deleteProperty(const QString &name); bool isCallable() const; - QJSValue call(const QJSValueList &args = QJSValueList()); // ### Qt6: Make const - QJSValue callWithInstance(const QJSValue &instance, const QJSValueList &args = QJSValueList()); // ### Qt6: Make const - QJSValue callAsConstructor(const QJSValueList &args = QJSValueList()); // ### Qt6: Make const + QJSValue call(const QJSValueList &args = QJSValueList()) const; + QJSValue callWithInstance(const QJSValue &instance, const QJSValueList &args = QJSValueList()) const; + QJSValue callAsConstructor(const QJSValueList &args = QJSValueList()) const; ErrorType errorType() const; #ifdef QT_DEPRECATED -- cgit v1.2.3