diff options
author | Lars Knoll <lars.knoll@qt.io> | 2019-11-13 18:59:09 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2019-12-08 21:51:27 +0100 |
commit | 8e34d49201b46b1e16cd3a8c99236f03a8250ff9 (patch) | |
tree | 8dd1761408f0f2fc6663d8d45d2df50b7efa1891 /tests/auto/corelib | |
parent | 8da5d35ae8ef0342adddf11705cad8ed60f871ad (diff) |
Use the QByteArray::DataPointer typedef instead of QByteArrayData
The goal here is to move things over to QArrayDataPointer. This prepares
for it.
Change-Id: I32f54a47594274799600c618f7341c200ceaa306
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/corelib')
-rw-r--r-- | tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp index 576b29f7a3..e913d4600d 100644 --- a/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp +++ b/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp @@ -150,12 +150,12 @@ private slots: }; static const QArrayData staticDataFlags = { Q_BASIC_ATOMIC_INITIALIZER(-1), QArrayData::StaticDataFlags, 0 }; -static const QByteArrayData staticStandard = { +static const QByteArray::DataPointer staticStandard = { static_cast<QTypedArrayData<char> *>(const_cast<QArrayData *>(&staticDataFlags)), const_cast<char *>("data"), 4 }; -static const QByteArrayData staticNotNullTerminated = { +static const QByteArray::DataPointer staticNotNullTerminated = { static_cast<QTypedArrayData<char> *>(const_cast<QArrayData *>(&staticDataFlags)), const_cast<char *>("dataBAD"), 4 @@ -167,7 +167,7 @@ QByteArray verifyZeroTermination(const QByteArray &ba) { // This test does some evil stuff, it's all supposed to work. - QByteArray::DataPtr baDataPtr = const_cast<QByteArray &>(ba).data_ptr(); + QByteArray::DataPointer baDataPtr = const_cast<QByteArray &>(ba).data_ptr(); // Skip if isStatic() or fromRawData(), as those offer no guarantees if (baDataPtr.d->isStatic() || baDataPtr.d->flags & QArrayData::RawDataType) |