/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
-** 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.
+** 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.
**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** 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.
-**
-**
-**
-**
+** 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.
**
**
** $QT_END_LICENSE$
#include "qv8engine_p.h"
#include "qjsconverter_impl_p.h"
-#include <QtCore/qjsonarray.h>
-#include <QtCore/qjsonobject.h>
-#include <QtCore/qjsonvalue.h>
-
QT_BEGIN_NAMESPACE
QV8JsonWrapper::QV8JsonWrapper()
return v8::Undefined();
}
-QJsonValue QV8JsonWrapper::toJsonValue(v8::Handle<v8::Value> value)
+QJsonValue QV8JsonWrapper::toJsonValue(v8::Handle<v8::Value> value,
+ V8ObjectSet &visitedObjects)
{
if (value->IsString())
return QJsonValue(QJSConverter::toString(value.As<v8::String>()));
else if (value->IsBoolean())
return QJsonValue(value->BooleanValue());
else if (value->IsArray())
- return toJsonArray(value.As<v8::Array>());
+ return toJsonArray(value.As<v8::Array>(), visitedObjects);
else if (value->IsObject())
- return toJsonObject(value.As<v8::Object>());
+ return toJsonObject(value.As<v8::Object>(), visitedObjects);
else if (value->IsNull())
return QJsonValue(QJsonValue::Null);
else
return v8object;
}
-QJsonObject QV8JsonWrapper::toJsonObject(v8::Handle<v8::Value> value)
+QJsonObject QV8JsonWrapper::toJsonObject(v8::Handle<v8::Value> value,
+ V8ObjectSet &visitedObjects)
{
QJsonObject result;
if (!value->IsObject() || value->IsArray() || value->IsFunction())
return result;
v8::Handle<v8::Object> v8object(value.As<v8::Object>());
- int hash = v8object->GetIdentityHash();
- if (m_visitedConversionObjects.contains(hash)) {
+ if (visitedObjects.contains(v8object)) {
// Avoid recursion.
// For compatibility with QVariant{List,Map} conversion, we return an
// empty object (and no error is thrown).
return result;
}
- m_visitedConversionObjects.insert(hash);
+ visitedObjects.insert(v8object);
v8::Local<v8::Array> propertyNames = m_engine->getOwnPropertyNames(v8object);
uint32_t length = propertyNames->Length();
v8::Local<v8::Value> name = propertyNames->Get(i);
v8::Local<v8::Value> propertyValue = v8object->Get(name);
if (!propertyValue->IsFunction())
- result.insert(QJSConverter::toString(name->ToString()), toJsonValue(propertyValue));
+ result.insert(QJSConverter::toString(name->ToString()),
+ toJsonValue(propertyValue, visitedObjects));
}
- m_visitedConversionObjects.remove(hash);
+ visitedObjects.remove(v8object);
return result;
}
return v8array;
}
-QJsonArray QV8JsonWrapper::toJsonArray(v8::Handle<v8::Value> value)
+QJsonArray QV8JsonWrapper::toJsonArray(v8::Handle<v8::Value> value,
+ V8ObjectSet &visitedObjects)
{
QJsonArray result;
if (!value->IsArray())
return result;
v8::Handle<v8::Array> v8array(value.As<v8::Array>());
- int hash = v8array->GetIdentityHash();
- if (m_visitedConversionObjects.contains(hash)) {
+ if (visitedObjects.contains(v8array)) {
// Avoid recursion.
// For compatibility with QVariant{List,Map} conversion, we return an
// empty array (and no error is thrown).
return result;
}
- m_visitedConversionObjects.insert(hash);
+ visitedObjects.insert(v8array);
uint32_t length = v8array->Length();
for (uint32_t i = 0; i < length; ++i) {
v8::Local<v8::Value> element = v8array->Get(i);
if (!element->IsFunction())
- result.append(toJsonValue(element));
+ result.append(toJsonValue(element, visitedObjects));
}
- m_visitedConversionObjects.remove(hash);
+ visitedObjects.remove(v8array);
return result;
}
projects / profile / ivi / qtdeclarative.git / blobdiff