diff options
author | Jedrzej Nowacki <jedrzej.nowacki@nokia.com> | 2011-08-04 11:21:57 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-10 12:49:39 +0200 |
commit | 9c8c36ccc0d11d31edf2582da1bee670c3db20d5 (patch) | |
tree | 084afb5897aec51606425780a249094ec934c6e0 /src | |
parent | 4afad4cc62b2db50b12bf476677ef5fb9b7c9458 (diff) |
Code cleanup: unify string conversions.
Unify string conversions when there is not any external string wrapper.
Change-Id: I6665e33c968b9d1c6ad86595639967ddcd257667
Reviewed-on: http://codereview.qt.nokia.com/2701
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/qml/v8/qjsconverter_p.h | 3 | ||||
-rw-r--r-- | src/declarative/qml/v8/qv8stringwrapper.cpp | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/declarative/qml/v8/qjsconverter_p.h b/src/declarative/qml/v8/qjsconverter_p.h index 4aec472c7a..c42381bc55 100644 --- a/src/declarative/qml/v8/qjsconverter_p.h +++ b/src/declarative/qml/v8/qjsconverter_p.h @@ -28,6 +28,7 @@ #include <QtCore/qglobal.h> #include <QtCore/qnumeric.h> #include <QtCore/qstring.h> +#include <QtCore/qstringlist.h> #include <QtCore/qvarlengtharray.h> #include <QtCore/qregexp.h> #include <QtCore/qdatetime.h> @@ -70,7 +71,7 @@ public: return qstr; } - static v8::Handle<v8::String> toString(const QString& string) + static v8::Local<v8::String> toString(const QString& string) { return v8::String::New(reinterpret_cast<const uint16_t*>(string.data()), string.size()); } diff --git a/src/declarative/qml/v8/qv8stringwrapper.cpp b/src/declarative/qml/v8/qv8stringwrapper.cpp index 5178da07fe..1fea98fdc0 100644 --- a/src/declarative/qml/v8/qv8stringwrapper.cpp +++ b/src/declarative/qml/v8/qv8stringwrapper.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qv8stringwrapper_p.h" +#include "qjsconverter_p.h" QT_BEGIN_NAMESPACE @@ -73,7 +74,7 @@ void QV8StringWrapper::destroy() v8::Local<v8::String> QV8StringWrapper::toString(const QString &qstr) { // return v8::String::NewExternal(new QV8StringResource(qstr)); - return v8::String::New((uint16_t*)qstr.constData(), qstr.length()); + return QJSConverter::toString(qstr); } QString QV8StringWrapper::toString(v8::Handle<v8::String> jsstr) @@ -84,10 +85,7 @@ QString QV8StringWrapper::toString(v8::Handle<v8::String> jsstr) QV8StringResource *r = (QV8StringResource *)jsstr->GetExternalStringResource(); return r->str; } else { - QString qstr; - qstr.resize(jsstr->Length()); - jsstr->Write((uint16_t*)qstr.data()); - return qstr; + return QJSConverter::toString(jsstr); } } |