Remove QJSValue::toInt32() and toUInt32() functions

toInt() and toUInt() should be used instead.

Task-number: QTBUG-23604
Change-Id: Ib64aea139e9082066a1e5096ef9fe3a97c35d3eb
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>

diff --git a/src/declarative/qml/v8/qjsvalue.cpp b/src/declarative/qml/v8/qjsvalue.cpp
index 302c768..08f1ef4 100644 (file)
--- a/src/declarative/qml/v8/qjsvalue.cpp
+++ b/src/declarative/qml/v8/qjsvalue.cpp
@@ -448,34 +448,6 @@ quint32 QJSValue::toUInt() const
     return d->toUInt32();
 }
 
-#ifdef QT_DEPRECATED
-
-/*!
-  \obsolete
-
-  Use toInt() instead.
-*/
-qint32 QJSValue::toInt32() const
-{
-    Q_D(const QJSValue);
-    QScriptIsolate api(d->engine());
-    return d->toInt32();
-}
-
-/*!
-  \obsolete
-
-  Use toUInt() instead.
-*/
-quint32 QJSValue::toUInt32() const
-{
-    Q_D(const QJSValue);
-    QScriptIsolate api(d->engine());
-    return d->toUInt32();
-}
-
-#endif // QT_DEPRECATED
-
 /*!
   Returns the QVariant value of this QJSValue, if it can be
   converted to a QVariant; otherwise returns an invalid QVariant.

diff --git a/src/declarative/qml/v8/qjsvalue.h b/src/declarative/qml/v8/qjsvalue.h
index 2cb32f9..82ceadf 100644 (file)
--- a/src/declarative/qml/v8/qjsvalue.h
+++ b/src/declarative/qml/v8/qjsvalue.h
@@ -121,8 +121,6 @@ public:
     QT_DEPRECATED QJSEngine *engine() const;
 
     QT_DEPRECATED bool isFunction() const;
-    QT_DEPRECATED qint32 toInt32() const;
-    QT_DEPRECATED quint32 toUInt32() const;
 
     QT_DEPRECATED QJSValue call(const QJSValue &thisObject = QJSValue(),
                       const QJSValueList &args = QJSValueList());