1 files changed, 21 insertions, 28 deletions

diff --git a/src/corelib/json/qjsonvalue.cpp b/src/corelib/json/qjsonvalue.cpp
index 6e40308de3..ac4fcb89c1 100644
--- a/src/corelib/json/qjsonvalue.cpp
+++ b/src/corelib/json/qjsonvalue.cpp
@@ -1,40 +1,32 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** 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
+** 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
 ** 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.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
+** 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.
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -420,17 +412,17 @@ QJsonValue QJsonValue::fromVariant(const QVariant &variant)
 }
 
 /*!
-    Converts the value to a QVariant.
+    Converts the value to a \l {QVariant::}{QVariant()}.
 
     The QJsonValue types will be converted as follows:
 
-    \value Null     QVariant()
+    \value Null     {QVariant::}{QVariant()}
     \value Bool     QMetaType::Bool
     \value Double   QMetaType::Double
     \value String   QString
     \value Array    QVariantList
     \value Object   QVariantMap
-    \value Undefined QVariant()
+    \value Undefined {QVariant::}{QVariant()}
 
     \sa fromVariant()
  */
@@ -553,7 +545,7 @@ QJsonArray QJsonValue::toArray(const QJsonArray &defaultValue) const
 
     Converts the value to an array and returns it.
 
-    If type() is not Array, a QJsonArray() will be returned.
+    If type() is not Array, a \l{QJsonArray::}{QJsonArray()} will be returned.
  */
 QJsonArray QJsonValue::toArray() const
 {
@@ -578,8 +570,8 @@ QJsonObject QJsonValue::toObject(const QJsonObject &defaultValue) const
 
     Converts the value to an object and returns it.
 
-    If type() is not Object, the QJsonObject() will be returned.
- */
+    If type() is not Object, the \l {QJsonObject::}{QJsonObject()} will be returned.
+*/
 QJsonObject QJsonValue::toObject() const
 {
     return toObject(QJsonObject());
@@ -673,10 +665,11 @@ void QJsonValue::detach()
     However, they are not explicitly documented here.
 */
 
+
 QJsonValueRef &QJsonValueRef::operator =(const QJsonValue &val)
 {
     if (is_object)
-        UnionHelper::setValueAt(this, val);
+        o->setValueAt(index, val);
     else
         a->replace(index, val);
 
@@ -686,7 +679,7 @@ QJsonValueRef &QJsonValueRef::operator =(const QJsonValue &val)
 QJsonValueRef &QJsonValueRef::operator =(const QJsonValueRef &ref)
 {
     if (is_object)
-        UnionHelper::setValueAt(this, ref);
+        o->setValueAt(index, ref);
     else
         a->replace(index, ref);
 
@@ -707,7 +700,7 @@ QJsonValue QJsonValueRef::toValue() const
 {
     if (!is_object)
         return a->at(index);
-    return UnionHelper::valueAt(this);
+    return o->valueAt(index);
 }
 
 #if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_JSON_READONLY)