summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qbytearray.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2013-07-30 12:16:31 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-30 20:34:11 +0200
commit8fd3d53a93d50506a0c3fa620e560cf1b03ba3c0 (patch)
tree74bac3448f41b7a4f4463aa7f9bb088a61aadb60 /src/corelib/tools/qbytearray.cpp
parentdb13d9b8a13b82df71f199f20f03a24a4c5b8175 (diff)
QByteArray: Remove some reinterpret_cast<>.
Fix warning: QByteArray(QByteArrayDataPtr dd) constructor warning C4946: reinterpret_cast used between related classes: 'QArrayData' and 'QTypedArrayData<T>'. Task-number: QTBUG-32559 Change-Id: I06356902f79ed6bf784127ff0c3a97d3263a25da Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'src/corelib/tools/qbytearray.cpp')
-rw-r--r--src/corelib/tools/qbytearray.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp
index 75900e9775..6ce17e5e13 100644
--- a/src/corelib/tools/qbytearray.cpp
+++ b/src/corelib/tools/qbytearray.cpp
@@ -585,7 +585,7 @@ QByteArray qUncompress(const uchar* data, int nbytes)
d->data()[len] = 0;
{
- QByteArrayDataPtr dataPtr = { reinterpret_cast<QByteArrayData *>(d.take()) };
+ QByteArrayDataPtr dataPtr = { d.take() };
return QByteArray(dataPtr);
}
@@ -3151,7 +3151,7 @@ QByteArray QByteArray::trimmed() const
}
int l = end - start + 1;
if (l <= 0) {
- QByteArrayDataPtr empty = { reinterpret_cast<QByteArrayData *>(Data::allocate(0)) };
+ QByteArrayDataPtr empty = { Data::allocate(0) };
return QByteArray(empty);
}
return QByteArray(s+start, l);
@@ -3888,7 +3888,7 @@ QByteArray QByteArray::fromRawData(const char *data, int size)
x = Data::fromRawData(data, size);
Q_CHECK_PTR(x);
}
- QByteArrayDataPtr dataPtr = { reinterpret_cast<QByteArrayData *>(x) };
+ QByteArrayDataPtr dataPtr = { x };
return QByteArray(dataPtr);
}