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>
sailfishos · Feb 2, 2012 · 9e7e0c1 · 9e7e0c1
1 parent 88cb064
commit 9e7e0c1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 29 deletions.
diff --git a/src/declarative/qml/v8/qjsvalue.cpp b/src/declarative/qml/v8/qjsvalue.cpp
@@ -555,30 +555,6 @@ QJSValue QJSValue::callAsConstructor(const QJSValueList &args)
 
 #ifdef QT_DEPRECATED
 
-/*!
-  \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
 

diff --git a/src/declarative/qml/v8/qjsvalue.h b/src/declarative/qml/v8/qjsvalue.h
@@ -113,18 +113,14 @@ class Q_DECLARATIVE_EXPORT QJSValue
     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());
 
 #ifdef QT_DEPRECATED
     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: