summaryrefslogtreecommitdiffstats
path: root/src/corelib/json
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2016-04-26 16:40:37 -0700
committerJani Heikkinen <jani.heikkinen@qt.io>2016-05-26 18:02:49 +0000
commit5c2ff22ba117f295718c529198ab42ee4646d90c (patch)
treebc1a9625b580dde5dd961203b944a18531d306bf /src/corelib/json
parent2fb026d58b45f50ed7d5666de58c9184e81bbc60 (diff)
Use void instead of uchar in the endian-swapping function parametersv5.7.0-rc1
This allows us to pass pointers to storage that is not an array of uchar, which it hardly ever is. Change-Id: Ifea6e497f11a461db432ffff14490d2c2df21906 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/json')
-rw-r--r--src/corelib/json/qjson.cpp2
-rw-r--r--src/corelib/json/qjsonparser.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/json/qjson.cpp b/src/corelib/json/qjson.cpp
index bb98e25fa5..4b98ef076c 100644
--- a/src/corelib/json/qjson.cpp
+++ b/src/corelib/json/qjson.cpp
@@ -435,7 +435,7 @@ void Value::copyData(const QJsonValue &v, char *dest, bool compressed)
switch (v.t) {
case QJsonValue::Double:
if (!compressed) {
- qToLittleEndian(v.ui, (uchar *)dest);
+ qToLittleEndian(v.ui, dest);
}
break;
case QJsonValue::String: {
diff --git a/src/corelib/json/qjsonparser.cpp b/src/corelib/json/qjsonparser.cpp
index 2926adf10a..6a3d1de99a 100644
--- a/src/corelib/json/qjsonparser.cpp
+++ b/src/corelib/json/qjsonparser.cpp
@@ -738,7 +738,7 @@ bool Parser::parseNumber(QJsonPrivate::Value *val, int baseOffset)
}
int pos = reserveSpace(sizeof(double));
- qToLittleEndian(ui, reinterpret_cast<uchar *>(data + pos));
+ qToLittleEndian(ui, data + pos);
if (current - baseOffset >= Value::MaxSize) {
lastError = QJsonParseError::DocumentTooLarge;
return false;