From bd8ef8d073201504a983249c4006c827befacf09 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 1 Feb 2012 17:04:19 +0100 Subject: 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 Reviewed-by: Bradley T. Hughes --- src/corelib/json/qjsonarray.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/json/qjsonarray.cpp') diff --git a/src/corelib/json/qjsonarray.cpp b/src/corelib/json/qjsonarray.cpp index ad9ca7bca7d..0eb1974147b 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); -- cgit v1.2.3