diff options
| author | Jedrzej Nowacki <jedrzej.nowacki@nokia.com> | 2009-08-18 09:01:33 (GMT) |
|---|---|---|
| committer | Jedrzej Nowacki <jedrzej.nowacki@nokia.com> | 2009-08-18 09:15:11 (GMT) |
| commit | 60ad9486a959ac1beb9b850be18fbb787173cfa0 (patch) | |
| tree | a9b080f78861ed9d9bcb745d84e320bcc57326a4 /src/3rdparty/webkit/WebCore | |
| parent | 4d92ed2203ced87802e3e91e530209619d7d2e71 (diff) | |
| download | Qt-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/3rdparty/webkit/WebCore')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/bindings/js/JSClipboardCustom.cpp | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/bindings/js/JSLazyEventListener.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSClipboardCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSClipboardCustom.cpp index 78dca49..73946c8 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSClipboardCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSClipboardCustom.cpp @@ -59,7 +59,7 @@ JSValue JSClipboard::types(ExecState* exec) const MarkedArgumentBuffer list; HashSet<String>::const_iterator end = types.end(); for (HashSet<String>::const_iterator it = types.begin(); it != end; ++it) - list.append(jsString(exec, UString(*it))); + list.append(jsString(exec, it->operator UString())); return constructArray(exec, list); } diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSLazyEventListener.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSLazyEventListener.cpp index 7caff2b..f4758e4 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSLazyEventListener.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSLazyEventListener.cpp @@ -97,7 +97,7 @@ void JSLazyEventListener::parseCode() const ExecState* exec = m_globalObject->globalExec(); MarkedArgumentBuffer args; - UString sourceURL(executionContext->url().string()); + UString sourceURL(executionContext->url().string().operator UString()); args.append(jsNontrivialString(exec, m_eventParameterName)); args.append(jsString(exec, m_code)); |