Remove "All rights reserved" line from license headers.

[profile/ivi/qtdeclarative.git] / src / declarative / qml / v8 / qv8stringwrapper.cpp

diff --git a/src/declarative/qml/v8/qv8stringwrapper.cpp b/src/declarative/qml/v8/qv8stringwrapper.cpp
index 883c482..bff9321 100644 (file)
--- a/src/declarative/qml/v8/qv8stringwrapper.cpp
+++ b/src/declarative/qml/v8/qv8stringwrapper.cpp
@@ -1,34 +1,34 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
 ** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
+** rights. These rights are described in the Nokia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
 **
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
 **
 **
 **
@@ -40,20 +40,11 @@
 ****************************************************************************/
 
 #include "qv8stringwrapper_p.h"
+#include "qjsconverter_p.h"
+#include "qjsconverter_impl_p.h"
 
 QT_BEGIN_NAMESPACE
 
-class QV8StringResource : public v8::String::ExternalStringResource
-{
-public:
-    QV8StringResource(const QString &str) : str(str) {}
-    virtual const uint16_t* data() const { return (uint16_t*)str.constData(); }
-    virtual size_t length() const { return str.length(); }
-    virtual void Dispose() { delete this; }
-
-    QString str;
-};
-
 QV8StringWrapper::QV8StringWrapper()
 {
 }
@@ -72,22 +63,15 @@ 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)
 {
     if (jsstr.IsEmpty()) {
         return QString();
-    } else if (jsstr->IsExternal()) {
-        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);
     }
 }