diff options
| author | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-13 23:23:50 (GMT) |
|---|---|---|
| committer | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-13 23:23:50 (GMT) |
| commit | 1bcb6aead8dcb482b56147b1f0af4440b1008d1c (patch) | |
| tree | 0a3f221d7bfe91bcf7a5333dac22f26703d20460 /src/script/api/qscriptvalue.cpp | |
| parent | 9e43002b7d7319c143c97b707e095fef434d0af2 (diff) | |
| parent | f393ae6dd4cc8e40c5b97c18efe7862253bc2bdd (diff) | |
| download | Qt-1bcb6aead8dcb482b56147b1f0af4440b1008d1c.zip Qt-1bcb6aead8dcb482b56147b1f0af4440b1008d1c.tar.gz Qt-1bcb6aead8dcb482b56147b1f0af4440b1008d1c.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/script/api/qscriptvalue.cpp')
| -rw-r--r-- | src/script/api/qscriptvalue.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp index 9b600a8..2ca036a 100644 --- a/src/script/api/qscriptvalue.cpp +++ b/src/script/api/qscriptvalue.cpp @@ -1227,7 +1227,7 @@ bool QScriptValue::strictlyEquals(const QScriptValue &other) const if (d->type != other.d_ptr->type) return false; switch (d->type) { - case QScriptValuePrivate::JSC: + case QScriptValuePrivate::JavaScriptCore: return JSC::JSValue::strictEqual(d->jscValue, other.d_ptr->jscValue); case QScriptValuePrivate::Number: return (d->numberValue == other.d_ptr->numberValue); @@ -1255,7 +1255,7 @@ QString QScriptValue::toString() const if (!d) return QString(); switch (d->type) { - case QScriptValuePrivate::JSC: { + case QScriptValuePrivate::JavaScriptCore: { JSC::ExecState *exec = d->engine ? d->engine->currentFrame : 0; JSC::JSValue savedException; QScriptValuePrivate::saveException(exec, &savedException); @@ -1296,7 +1296,7 @@ qsreal QScriptValue::toNumber() const if (!d) return 0; switch (d->type) { - case QScriptValuePrivate::JSC: { + case QScriptValuePrivate::JavaScriptCore: { JSC::ExecState *exec = d->engine ? d->engine->currentFrame : 0; JSC::JSValue savedException; QScriptValuePrivate::saveException(exec, &savedException); @@ -1323,7 +1323,7 @@ bool QScriptValue::toBoolean() const if (!d) return false; switch (d->type) { - case QScriptValuePrivate::JSC: { + case QScriptValuePrivate::JavaScriptCore: { JSC::ExecState *exec = d->engine ? d->engine->currentFrame : 0; JSC::JSValue savedException; QScriptValuePrivate::saveException(exec, &savedException); @@ -1359,7 +1359,7 @@ bool QScriptValue::toBool() const if (!d) return false; switch (d->type) { - case QScriptValuePrivate::JSC: { + case QScriptValuePrivate::JavaScriptCore: { JSC::ExecState *exec = d->engine ? d->engine->currentFrame : 0; JSC::JSValue savedException; QScriptValuePrivate::saveException(exec, &savedException); @@ -1393,7 +1393,7 @@ qint32 QScriptValue::toInt32() const if (!d) return 0; switch (d->type) { - case QScriptValuePrivate::JSC: { + case QScriptValuePrivate::JavaScriptCore: { JSC::ExecState *exec = d->engine ? d->engine->currentFrame : 0; JSC::JSValue savedException; QScriptValuePrivate::saveException(exec, &savedException); @@ -1427,7 +1427,7 @@ quint32 QScriptValue::toUInt32() const if (!d) return 0; switch (d->type) { - case QScriptValuePrivate::JSC: { + case QScriptValuePrivate::JavaScriptCore: { JSC::ExecState *exec = d->engine ? d->engine->currentFrame : 0; JSC::JSValue savedException; QScriptValuePrivate::saveException(exec, &savedException); @@ -1461,7 +1461,7 @@ quint16 QScriptValue::toUInt16() const if (!d) return 0; switch (d->type) { - case QScriptValuePrivate::JSC: { + case QScriptValuePrivate::JavaScriptCore: { // ### no equivalent function in JSC return QScript::ToUint16(toNumber()); } @@ -1491,7 +1491,7 @@ qsreal QScriptValue::toInteger() const if (!d) return 0; switch (d->type) { - case QScriptValuePrivate::JSC: { + case QScriptValuePrivate::JavaScriptCore: { JSC::ExecState *exec = d->engine ? d->engine->currentFrame : 0; JSC::JSValue savedException; QScriptValuePrivate::saveException(exec, &savedException); @@ -1535,7 +1535,7 @@ QVariant QScriptValue::toVariant() const if (!d) return QVariant(); switch (d->type) { - case QScriptValuePrivate::JSC: + case QScriptValuePrivate::JavaScriptCore: if (isObject()) { if (isVariant()) return d->variantValue(); @@ -2190,7 +2190,7 @@ bool QScriptValue::isNumber() const if (!d) return false; switch (d->type) { - case QScriptValuePrivate::JSC: + case QScriptValuePrivate::JavaScriptCore: return d->jscValue.isNumber(); case QScriptValuePrivate::Number: return true; @@ -2212,7 +2212,7 @@ bool QScriptValue::isString() const if (!d) return false; switch (d->type) { - case QScriptValuePrivate::JSC: + case QScriptValuePrivate::JavaScriptCore: return d->jscValue.isString(); case QScriptValuePrivate::Number: return false; |