diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-02-01 17:04:19 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-02 01:56:03 +0100 |
| commit | bd8ef8d073201504a983249c4006c827befacf09 (patch) | |
| tree | e096d27c74b4183996026d57ad93b4fca4afa43b /src/corelib/json/qjsonarray.cpp | |
| parent | 15f253a46aa45e2a9fa1055799fa2768ba49b9a3 (diff) | |
Fix some warnings from clang
One of them was a real error, that could
lead to Data::alloc containing wrong values.
Change-Id: I48315ef6fd59188630107ebbe7bf8dbaa5da689e
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/corelib/json/qjsonarray.cpp')
| -rw-r--r-- | src/corelib/json/qjsonarray.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/json/qjsonarray.cpp b/src/corelib/json/qjsonarray.cpp index ad9ca7bca7..0eb1974147 100644 --- a/src/corelib/json/qjsonarray.cpp +++ b/src/corelib/json/qjsonarray.cpp @@ -257,7 +257,7 @@ void QJsonArray::prepend(const QJsonValue &value) */ void QJsonArray::append(const QJsonValue &value) { - insert(a ? a->length : 0, value); + insert(a ? (int)a->length : 0, value); } /*! @@ -330,7 +330,7 @@ QJsonValue QJsonArray::takeAt(int i) */ void QJsonArray::insert(int i, const QJsonValue &value) { - Q_ASSERT (i >= 0 && i <= (int)(a ? a->length : 0)); + Q_ASSERT (i >= 0 && i <= (a ? (int)a->length : 0)); bool compressed; int valueSize = QJsonPrivate::Value::requiredStorage(value, &compressed); |