diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-01-20 07:08:08 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-02 12:07:13 +0100 |
commit | fe6173c580ea58529d3b784c8396eabe3a394e85 (patch) | |
tree | 2df3103e37dc4ea1852e4fea73baa6f4157870b2 /src/declarative/qml/v8 | |
parent | 9e7e0c16fc5a84a6af3e8027d48dc167c0e7d583 (diff) |
Remove QJSValue::isFunction() function
Rationale: QJSValue::isCallable() should be used instead. There is no
compelling reason to be able to distinguish between JS Function
instances and other callable objects.
Task-number: QTBUG-23604
Change-Id: Ieef6b32030ef70f54081035fd4ffc3c17c184cd3
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Diffstat (limited to 'src/declarative/qml/v8')
-rw-r--r-- | src/declarative/qml/v8/qjsvalue.cpp | 16 | ||||
-rw-r--r-- | src/declarative/qml/v8/qjsvalue.h | 2 |
2 files changed, 0 insertions, 18 deletions
diff --git a/src/declarative/qml/v8/qjsvalue.cpp b/src/declarative/qml/v8/qjsvalue.cpp index 244e6ae115..9e98eace67 100644 --- a/src/declarative/qml/v8/qjsvalue.cpp +++ b/src/declarative/qml/v8/qjsvalue.cpp @@ -324,22 +324,6 @@ bool QJSValue::isCallable() const return d->isCallable(); } -#ifdef QT_DEPRECATED - -/*! - \obsolete - - Use isCallable() instead. -*/ -bool QJSValue::isFunction() const -{ - Q_D(const QJSValue); - QScriptIsolate api(d->engine()); - return d->isCallable(); -} - -#endif // QT_DEPRECATED - /*! Returns true if this QJSValue is a variant value; otherwise returns false. diff --git a/src/declarative/qml/v8/qjsvalue.h b/src/declarative/qml/v8/qjsvalue.h index b1c36269af..ebb9c8be8e 100644 --- a/src/declarative/qml/v8/qjsvalue.h +++ b/src/declarative/qml/v8/qjsvalue.h @@ -119,8 +119,6 @@ public: #ifdef QT_DEPRECATED QT_DEPRECATED QJSEngine *engine() const; - - QT_DEPRECATED bool isFunction() const; #endif private: |