diff options
author | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2014-06-26 13:02:54 +0200 |
---|---|---|
committer | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2014-07-25 15:25:17 +0200 |
commit | 20cf632ad5f3ffe7b0fd231724c971f4e07304eb (patch) | |
tree | 6c393d91728928e5aaa33c64fea6a1797dcde7b9 /src/corelib/json/qjsonobject.cpp | |
parent | c8edde3b833cb3d15377afed13d6fcd2e5fa5cd9 (diff) |
Reading QJsonObject property should not modify the object itself.
Before this change such code:
QJsonObject o;
o["blah"];
would create property "blah" and assign null value to it, while
this code:
const QJsonObject o;
o["blah"];
would not. The change unifies the confusing behavior. Now reading
a non-existing property, is not causing a property to be added
in any visible way.
Internally QJsonObject stores a special hash of undefined, but
referenced values. Such reference is supposed to not live long,
only to the first compacting or assignment.
Change-Id: Ib022acf74ff49bad88d45d65d7093c4281d468f1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/corelib/json/qjsonobject.cpp')
-rw-r--r-- | src/corelib/json/qjsonobject.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/json/qjsonobject.cpp b/src/corelib/json/qjsonobject.cpp index fb975c65e0..94ec9a2818 100644 --- a/src/corelib/json/qjsonobject.cpp +++ b/src/corelib/json/qjsonobject.cpp @@ -134,6 +134,7 @@ QJsonObject::~QJsonObject() { if (d && !d->ref.deref()) delete d; + QJsonPrivate::ObjectUndefinedKeys::removeKeys(this); // ### Qt6 move it to ~QJsonValueRef } /*! @@ -290,14 +291,9 @@ QJsonValue QJsonObject::operator [](const QString &key) const */ QJsonValueRef QJsonObject::operator [](const QString &key) { - // ### somewhat inefficient, as we lookup the key twice if it doesn't yet exist bool keyExists = false; int index = o ? o->indexOf(key, &keyExists) : -1; - if (!keyExists) { - iterator i = insert(key, QJsonValue()); - index = i.i; - } - return QJsonValueRef(this, index); + return keyExists ? QJsonValueRef(this, index) : QJsonValueRef(this, key); } /*! @@ -1001,7 +997,9 @@ void QJsonObject::compact() detach(); d->compact(); - o = static_cast<QJsonPrivate::Object *>(d->header->root()); + using namespace QJsonPrivate; + o = static_cast<Object *>(d->header->root()); + ObjectUndefinedKeys::removeKeys(this); // ### Qt6 move it to ~QJsonValueRef } /*! @@ -1038,6 +1036,8 @@ void QJsonObject::setValueAt(int i, const QJsonValue &val) insert(e->key(), val); } +QBasicMutex QJsonPrivate::ObjectUndefinedKeys::mutex; + #if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_JSON_READONLY) QDebug operator<<(QDebug dbg, const QJsonObject &o) { |