summaryrefslogtreecommitdiffstats
path: root/src/script/bridge/qscriptvariant.cpp
diff options
context:
space:
mode:
authorJedrzej Nowacki <jedrzej.nowacki@nokia.com>2009-08-18 09:01:33 (GMT)
committerJedrzej Nowacki <jedrzej.nowacki@nokia.com>2009-08-18 09:15:11 (GMT)
commit60ad9486a959ac1beb9b850be18fbb787173cfa0 (patch)
treea9b080f78861ed9d9bcb745d84e320bcc57326a4 /src/script/bridge/qscriptvariant.cpp
parent4d92ed2203ced87802e3e91e530209619d7d2e71 (diff)
downloadQt-60ad9486a959ac1beb9b850be18fbb787173cfa0.zip
Qt-60ad9486a959ac1beb9b850be18fbb787173cfa0.tar.gz
Qt-60ad9486a959ac1beb9b850be18fbb787173cfa0.tar.bz2
Clean up.
Get rid of conversion functions QScript::qtStringFromJSCUString and QScript::qtStringToJSCUString. Code was moved to cast operators. Reviewed-by: Kent Hansen
Diffstat (limited to 'src/script/bridge/qscriptvariant.cpp')
-rw-r--r--src/script/bridge/qscriptvariant.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/bridge/qscriptvariant.cpp b/src/script/bridge/qscriptvariant.cpp
index d352a98..ee59e4f 100644
--- a/src/script/bridge/qscriptvariant.cpp
+++ b/src/script/bridge/qscriptvariant.cpp
@@ -98,7 +98,7 @@ static JSC::JSValue JSC_HOST_CALL variantProtoFuncValueOf(JSC::ExecState *exec,
case QVariant::Invalid:
return JSC::jsUndefined();
case QVariant::String:
- return JSC::jsString(exec, QScript::qtStringToJSCUString(v.toString()));
+ return JSC::jsString(exec, v.toString());
case QVariant::Int:
return JSC::jsNumber(exec, v.toInt());
@@ -135,7 +135,7 @@ static JSC::JSValue JSC_HOST_CALL variantProtoFuncToString(JSC::ExecState *exec,
JSC::UString result;
JSC::JSValue value = variantProtoFuncValueOf(exec, callee, thisValue, args);
if (value.isObject()) {
- result = QScript::qtStringToJSCUString(v.toString());
+ result = v.toString();
if (result.isEmpty()) {
result = "QVariant(";
result += v.typeName();