diff options
Diffstat (limited to 'src/corelib/serialization/qjsonarray.cpp')
| -rw-r--r-- | src/corelib/serialization/qjsonarray.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/corelib/serialization/qjsonarray.cpp b/src/corelib/serialization/qjsonarray.cpp index 167b6a3a77..f3b1f671a6 100644 --- a/src/corelib/serialization/qjsonarray.cpp +++ b/src/corelib/serialization/qjsonarray.cpp @@ -22,6 +22,7 @@ QT_BEGIN_NAMESPACE \inmodule QtCore \ingroup json \ingroup shared + \ingroup qtserialization \reentrant \since 5.0 @@ -339,7 +340,7 @@ void QJsonArray::append(const QJsonValue &value) */ void QJsonArray::removeAt(qsizetype i) { - if (!a || i < 0 || i >= a->elements.length()) + if (!a || i < 0 || i >= a->elements.size()) return; detach(); a->removeAt(i); @@ -375,7 +376,7 @@ void QJsonArray::removeAt(qsizetype i) */ QJsonValue QJsonArray::takeAt(qsizetype i) { - if (!a || i < 0 || i >= a->elements.length()) + if (!a || i < 0 || i >= a->elements.size()) return QJsonValue(QJsonValue::Undefined); detach(); @@ -394,11 +395,11 @@ QJsonValue QJsonArray::takeAt(qsizetype i) void QJsonArray::insert(qsizetype i, const QJsonValue &value) { if (a) - detach(a->elements.length() + 1); + detach(a->elements.size() + 1); else a = new QCborContainerPrivate; - Q_ASSERT (i >= 0 && i <= a->elements.length()); + Q_ASSERT (i >= 0 && i <= a->elements.size()); a->insertAt(i, value.type() == QJsonValue::Undefined ? QCborValue(nullptr) : QCborValue::fromJsonValue(value)); } @@ -429,7 +430,7 @@ void QJsonArray::insert(qsizetype i, const QJsonValue &value) */ void QJsonArray::replace(qsizetype i, const QJsonValue &value) { - Q_ASSERT (a && i >= 0 && i < a->elements.length()); + Q_ASSERT (a && i >= 0 && i < a->elements.size()); detach(); a->replaceAt(i, QCborValue::fromJsonValue(value)); } @@ -463,7 +464,7 @@ bool QJsonArray::contains(const QJsonValue &value) const */ QJsonValueRef QJsonArray::operator [](qsizetype i) { - Q_ASSERT(a && i >= 0 && i < a->elements.length()); + Q_ASSERT(a && i >= 0 && i < a->elements.size()); return QJsonValueRef(this, i); } @@ -486,13 +487,13 @@ bool QJsonArray::operator==(const QJsonArray &other) const return true; if (!a) - return !other.a->elements.length(); + return !other.a->elements.size(); if (!other.a) - return !a->elements.length(); - if (a->elements.length() != other.a->elements.length()) + return !a->elements.size(); + if (a->elements.size() != other.a->elements.size()) return false; - for (qsizetype i = 0; i < a->elements.length(); ++i) { + for (qsizetype i = 0; i < a->elements.size(); ++i) { if (a->valueAt(i) != other.a->valueAt(i)) return false; } |