summaryrefslogtreecommitdiffstats
path: root/src/script/api/qscriptvalue.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-09-10 14:41:08 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-09-10 14:42:04 (GMT)
commit62f5eac56ddc0ffc4e3ef812c6b593c1d16298bb (patch)
treeddaa1145f23d6f1298eff3eae89764adeb21781a /src/script/api/qscriptvalue.cpp
parenta21b661384c31e6c9154a99690b2d134a12b9187 (diff)
downloadQt-62f5eac56ddc0ffc4e3ef812c6b593c1d16298bb.zip
Qt-62f5eac56ddc0ffc4e3ef812c6b593c1d16298bb.tar.gz
Qt-62f5eac56ddc0ffc4e3ef812c6b593c1d16298bb.tar.bz2
Fix compilation with winscw
Winscw gets very confused when the name of an enum value is the same as the name of an entire namespace, JSC in this case. Renaming the enum value to JavaScriptCore fixes this. Rubber-stamped-by: Kent
Diffstat (limited to 'src/script/api/qscriptvalue.cpp')
-rw-r--r--src/script/api/qscriptvalue.cpp24
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;