From fe6173c580ea58529d3b784c8396eabe3a394e85 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Fri, 20 Jan 2012 07:08:08 +0100 Subject: [PATCH] Remove QJSValue::isFunction() function MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- src/declarative/qml/v8/qjsvalue.cpp | 16 ---------------- src/declarative/qml/v8/qjsvalue.h | 2 -- 2 files changed, 18 deletions(-) diff --git a/src/declarative/qml/v8/qjsvalue.cpp b/src/declarative/qml/v8/qjsvalue.cpp index 244e6ae..9e98eac 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 b1c3626..ebb9c8b 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: -- 2.7.4