diff options
| author | Jamey Hicks <jamey.hicks@nokia.com> | 2012-01-16 12:33:37 -0500 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-01-16 20:30:14 +0100 |
| commit | 8edb205a9b15de62f5762770ccdb347121f96efe (patch) | |
| tree | 7d6ea758bde46878930ca53701d0974fc4a65d80 | |
| parent | 805f64600b9f8ce8e969e8bf8ed45d66a27599fa (diff) | |
fix compilation after documentation update.
Change-Id: I0ba7b77803f338e6c1a1e861cce35ceea4f5dea8
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| -rw-r--r-- | src/qjsonarray.cpp | 2 | ||||
| -rw-r--r-- | src/qjsondocument.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/qjsonarray.cpp b/src/qjsonarray.cpp index cfd77d1..4b63cc3 100644 --- a/src/qjsonarray.cpp +++ b/src/qjsonarray.cpp @@ -389,7 +389,7 @@ void QJsonArray::replace(int i, const QJsonValue &value) bool QJsonArray::contains(const QJsonValue &value) const { for (int i = 0; i < size(); i++) { - if (at(i) == element) + if (at(i) == value) return true; } return false; diff --git a/src/qjsondocument.cpp b/src/qjsondocument.cpp index 5736ab0..5f9a709 100644 --- a/src/qjsondocument.cpp +++ b/src/qjsondocument.cpp @@ -222,12 +222,12 @@ QJsonDocument QJsonDocument::fromBinaryData(const QByteArray &data) QJsonDocument QJsonDocument::fromVariant(const QVariant &variant) { QJsonDocument doc; - if (v.type() == QVariant::Map) { - doc.setObject(QJsonObject::fromVariantMap(v.toMap())); - } else if (v.type() == QVariant::List) { - doc.setArray(QJsonArray::fromVariantList(v.toList())); - } else if (v.type() == QVariant::StringList) { - doc.setArray(QJsonArray::fromStringList(v.toStringList())); + if (variant.type() == QVariant::Map) { + doc.setObject(QJsonObject::fromVariantMap(variant.toMap())); + } else if (variant.type() == QVariant::List) { + doc.setArray(QJsonArray::fromVariantList(variant.toList())); + } else if (variant.type() == QVariant::StringList) { + doc.setArray(QJsonArray::fromStringList(variant.toStringList())); } return doc; } |