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

4 files changed, 18 insertions, 18 deletions

diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 087e49c..e39e1d1 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -890,7 +890,7 @@ JSC::JSValue QScriptEnginePrivate::jscValueFromVariant(const QVariant &v)
     QScriptValue vv = scriptValueFromVariant(v);
     QScriptValuePrivate *p = QScriptValuePrivate::get(vv);
     switch (p->type) {
-    case QScriptValuePrivate::JSC:
+    case QScriptValuePrivate::JavaScriptCore:
         return p->jscValue;
     case QScriptValuePrivate::Number:
         return JSC::jsNumber(currentFrame, p->numberValue);
diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h
index 4fb22f0..b36787b 100644
--- a/src/script/api/qscriptengine_p.h
+++ b/src/script/api/qscriptengine_p.h
@@ -316,7 +316,7 @@ inline JSC::JSValue QScriptEnginePrivate::scriptValueToJSCValue(const QScriptVal
     QScriptValuePrivate *vv = QScriptValuePrivate::get(value);
     if (!vv)
         return JSC::JSValue();
-    if (vv->type != QScriptValuePrivate::JSC) {
+    if (vv->type != QScriptValuePrivate::JavaScriptCore) {
         Q_ASSERT(!vv->engine || vv->engine == this);
         vv->engine = this;
         if (vv->type == QScriptValuePrivate::Number) {
@@ -340,7 +340,7 @@ inline void QScriptValuePrivate::initFrom(JSC::JSValue value)
         Q_ASSERT(engine != 0);
         value = engine->toUsableValue(value);
     }
-    type = JSC;
+    type = JavaScriptCore;
     jscValue = value;
     if (engine)
         engine->registerScriptValue(this);
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;
diff --git a/src/script/api/qscriptvalue_p.h b/src/script/api/qscriptvalue_p.h
index 7665acb..6cbda97 100644
--- a/src/script/api/qscriptvalue_p.h
+++ b/src/script/api/qscriptvalue_p.h
@@ -72,7 +72,7 @@ public:
     void operator delete(void*);
 
     enum Type {
-        JSC,
+        JavaScriptCore,
         Number,
         String
     };
@@ -112,7 +112,7 @@ public:
 
     qint64 objectId()
     {
-        if ( (type == JSC) && (engine) )
+        if ( (type == JavaScriptCore) && (engine) )
             return (qint64)jscValue.asCell();
         else
             return -1;
@@ -142,7 +142,7 @@ inline QScriptValuePrivate::QScriptValuePrivate(QScriptEnginePrivate *e)
 
 inline bool QScriptValuePrivate::isJSC() const
 {
-    return (type == JSC);
+    return (type == JavaScriptCore);
 }
 
 inline bool QScriptValuePrivate::isObject() const