Add operator-> to QJson iterators

The iterators for QJsonArray and QJsonObject are currently lacking an
operator-> definition. Unfortunately it is not possible to do in clean
way without redefining either the iterators or QJsonValueRef class.

This patch instead adds two fake pointer classes that are only used
to handle the operator-> return value.

Task-number: QTBUG-29573
Change-Id: Ief785a6afbbedc9e89cf3b6f3958c2c755997a66
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 27 insertions, 0 deletions

diff --git a/src/corelib/json/qjsonvalue.h b/src/corelib/json/qjsonvalue.h
index a00bc0b72f..2d0453f130 100644
--- a/src/corelib/json/qjsonvalue.h
+++ b/src/corelib/json/qjsonvalue.h
@@ -192,6 +192,33 @@ private:
     struct UnionHelper;
 };
 
+#ifndef Q_QDOC
+// ### Qt 6: Get rid of these fake pointer classes
+class QJsonValuePtr
+{
+    QJsonValue value;
+public:
+    explicit QJsonValuePtr(const QJsonValue& val)
+        : value(val) {}
+
+    QJsonValue& operator*() { return value; }
+    QJsonValue* operator->() { return &value; }
+};
+
+class QJsonValueRefPtr
+{
+    QJsonValueRef valueRef;
+public:
+    QJsonValueRefPtr(QJsonArray *array, int idx)
+        : valueRef(array, idx) {}
+    QJsonValueRefPtr(QJsonObject *object, int idx)
+        : valueRef(object, idx)  {}
+
+    QJsonValueRef& operator*() { return valueRef; }
+    QJsonValueRef* operator->() { return &valueRef; }
+};
+#endif
+
 #if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_JSON_READONLY)
 Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonValue &);
 #endif