diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-04-03 09:40:36 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-03 21:02:32 +0200 |
| commit | 3a9c06b7bd45613216101ffa34b5909c3b8dc6d8 (patch) | |
| tree | 46c9b879f85e053ce0c5199d8b6629c88c30553f /src/corelib/json | |
| parent | fd4f165eb78979a3573b9fa1a4a572600f9c47c7 (diff) | |
Fix warnings about signed/unsigned comparisons in QtJson.
Change-Id: I92071ea870bf0ebb740fcb360aff19658380a0cd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/json')
| -rw-r--r-- | src/corelib/json/qjsonarray.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/json/qjsonobject.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/json/qjsonarray.cpp b/src/corelib/json/qjsonarray.cpp index 6bae2001a1..d143215efd 100644 --- a/src/corelib/json/qjsonarray.cpp +++ b/src/corelib/json/qjsonarray.cpp @@ -275,7 +275,7 @@ void QJsonArray::removeAt(int i) detach(); a->removeItems(i, 1); ++d->compactionCounter; - if (d->compactionCounter > 32 && d->compactionCounter >= (int)a->length/2) + if (d->compactionCounter > 32u && d->compactionCounter >= unsigned(a->length) / 2u) compact(); } @@ -379,7 +379,7 @@ void QJsonArray::replace(int i, const QJsonValue &value) QJsonPrivate::Value::copyData(value, (char *)a + valueOffset, compressed); ++d->compactionCounter; - if (d->compactionCounter > 32 && d->compactionCounter >= (int)a->length/2) + if (d->compactionCounter > 32u && d->compactionCounter >= unsigned(a->length) / 2u) compact(); } diff --git a/src/corelib/json/qjsonobject.cpp b/src/corelib/json/qjsonobject.cpp index e14000fac3..e880078195 100644 --- a/src/corelib/json/qjsonobject.cpp +++ b/src/corelib/json/qjsonobject.cpp @@ -335,7 +335,7 @@ void QJsonObject::remove(const QString &key) detach(); o->removeItems(index, 1); ++d->compactionCounter; - if (d->compactionCounter > 32 && d->compactionCounter >= (int)o->length/2) + if (d->compactionCounter > 32u && d->compactionCounter >= unsigned(o->length) / 2u) compact(); } @@ -361,7 +361,7 @@ QJsonValue QJsonObject::take(const QString &key) QJsonPrivate::Entry *e = o->entryAt(index); o->removeItems(index, 1); ++d->compactionCounter; - if (d->compactionCounter > 32 && d->compactionCounter >= (int)o->length/2) + if (d->compactionCounter > 32u && d->compactionCounter >= unsigned(o->length) / 2u) compact(); return QJsonValue(d, o, e->value); @@ -432,7 +432,7 @@ QJsonObject::iterator QJsonObject::erase(QJsonObject::iterator it) o->removeItems(index, 1); ++d->compactionCounter; - if (d->compactionCounter > 32 && d->compactionCounter >= (int)o->length/2) + if (d->compactionCounter > 32u && d->compactionCounter >= unsigned(o->length) / 2u) compact(); // iterator hasn't changed |