diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-01-18 14:36:28 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-02 12:07:13 +0100 |
| commit | 9e7e0c16fc5a84a6af3e8027d48dc167c0e7d583 (patch) | |
| tree | 6c3c642fc1246790422e6e7ae85f2f603b16ff52 | |
| parent | 88cb0644c8ab3768e4e3c8152f048239b429b1e2 (diff) | |
Remove QJSValue::construct() and deprecated call() overload
callAsConstructor() should be used instead.
Task-number: QTBUG-23604
Change-Id: If95ab9906712ede7cbae5e9d24624708bccf880f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
| -rw-r--r-- | src/declarative/qml/v8/qjsvalue.cpp | 24 | ||||
| -rw-r--r-- | src/declarative/qml/v8/qjsvalue.h | 6 |
2 files changed, 1 insertions, 29 deletions
diff --git a/src/declarative/qml/v8/qjsvalue.cpp b/src/declarative/qml/v8/qjsvalue.cpp index 08f1ef432e..244e6ae115 100644 --- a/src/declarative/qml/v8/qjsvalue.cpp +++ b/src/declarative/qml/v8/qjsvalue.cpp @@ -558,30 +558,6 @@ QJSValue QJSValue::callAsConstructor(const QJSValueList &args) /*! \obsolete - Use callWithInstance() instead. -*/ -QJSValue QJSValue::call(const QJSValue& thisObject, const QJSValueList& args) -{ - Q_D(QJSValue); - QScriptIsolate api(d->engine()); - return d->call(QJSValuePrivate::get(thisObject), args); -} - -/*! - \obsolete - - Use callAsConstructor() instead. -*/ -QJSValue QJSValue::construct(const QJSValueList &args) -{ - Q_D(QJSValue); - QScriptIsolate api(d->engine()); - return QJSValuePrivate::get(d->callAsConstructor(args)); -} - -/*! - \obsolete - Returns the QJSEngine that created this QJSValue, or 0 if this QJSValue is invalid or the value is not associated with a particular engine. diff --git a/src/declarative/qml/v8/qjsvalue.h b/src/declarative/qml/v8/qjsvalue.h index 82ceadf558..b1c36269af 100644 --- a/src/declarative/qml/v8/qjsvalue.h +++ b/src/declarative/qml/v8/qjsvalue.h @@ -113,7 +113,7 @@ public: bool deleteProperty(const QString &name); bool isCallable() const; - QJSValue call(const QJSValueList &args); + QJSValue call(const QJSValueList &args = QJSValueList()); QJSValue callWithInstance(const QJSValue &instance, const QJSValueList &args = QJSValueList()); QJSValue callAsConstructor(const QJSValueList &args = QJSValueList()); @@ -121,10 +121,6 @@ public: QT_DEPRECATED QJSEngine *engine() const; QT_DEPRECATED bool isFunction() const; - - QT_DEPRECATED QJSValue call(const QJSValue &thisObject = QJSValue(), - const QJSValueList &args = QJSValueList()); - QT_DEPRECATED QJSValue construct(const QJSValueList &args = QJSValueList()); #endif private: |