diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-01-09 12:08:18 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-11 15:52:35 +0100 |
commit | 30fdb6d971b827c862552eb83917beaebdc37ed8 (patch) | |
tree | 6632da4fa505ea14eda1b8762986b0302847eac9 /src/declarative/qml | |
parent | 424d30275c0d70698cbdd349f8026c38eebc59b7 (diff) |
Remove obsolete toBoolean() and isBoolean() QJSValue getters
We should use "toBool" and "isBool" for consistency with QVariant.
Change-Id: I266f2a36a034a5b323e614777ceacbc0d2ffec16
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Diffstat (limited to 'src/declarative/qml')
-rw-r--r-- | src/declarative/qml/v8/qjsvalue.cpp | 26 | ||||
-rw-r--r-- | src/declarative/qml/v8/qjsvalue.h | 2 |
2 files changed, 0 insertions, 28 deletions
diff --git a/src/declarative/qml/v8/qjsvalue.cpp b/src/declarative/qml/v8/qjsvalue.cpp index 0924378655..7df1d04847 100644 --- a/src/declarative/qml/v8/qjsvalue.cpp +++ b/src/declarative/qml/v8/qjsvalue.cpp @@ -369,20 +369,6 @@ bool QJSValue::isBool() const } /*! - \obsolete - - Use isBool() instead. - Returns true if this QJSValue is of the primitive type Boolean; - otherwise returns false. -*/ -bool QJSValue::isBoolean() const -{ - Q_D(const QJSValue); - QScriptIsolate api(d->engine()); - return d->isBool(); -} - -/*! Returns true if this QJSValue is of the primitive type Number; otherwise returns false. @@ -558,18 +544,6 @@ bool QJSValue::toBool() const } /*! - \obsolete - - Use toBool() instead. -*/ -bool QJSValue::toBoolean() const -{ - Q_D(const QJSValue); - QScriptIsolate api(d->engine()); - return d->toBool(); -} - -/*! Returns the integer value of this QJSValue, using the conversion rules described in \l{ECMA-262} section 9.4, "ToInteger". diff --git a/src/declarative/qml/v8/qjsvalue.h b/src/declarative/qml/v8/qjsvalue.h index a5e44a6985..c75bd3fdc4 100644 --- a/src/declarative/qml/v8/qjsvalue.h +++ b/src/declarative/qml/v8/qjsvalue.h @@ -92,7 +92,6 @@ public: QJSEngine *engine() const; bool isValid() const; bool isBool() const; - bool isBoolean() const; bool isNumber() const; bool isFunction() const; bool isNull() const; @@ -109,7 +108,6 @@ public: QString toString() const; double toNumber() const; bool toBool() const; - bool toBoolean() const; double toInteger() const; qint32 toInt32() const; quint32 toUInt32() const; |