diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2019-11-13 20:33:50 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2019-12-08 21:51:33 +0100 |
| commit | 20041afe3bdb3d3476c02897b8da288cba6011f4 (patch) | |
| tree | 1f7eba83f17d80f258efe16beb4519152f38e5e8 /tests/auto | |
| parent | 8e34d49201b46b1e16cd3a8c99236f03a8250ff9 (diff) | |
Use QArrayDataPointer to implement QByteArray
Change-Id: I2ee28023c2dea9fc3160400112c59a47566a4868
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto')
| -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 e913d4600d..2f3f9c2d79 100644 --- a/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp +++ b/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp @@ -170,7 +170,7 @@ QByteArray verifyZeroTermination(const QByteArray &ba) 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) + if (baDataPtr->isStatic() || baDataPtr->flags() & QArrayData::RawDataType) return ba; int baSize = ba.size(); @@ -181,7 +181,7 @@ QByteArray verifyZeroTermination(const QByteArray &ba) .arg(baTerminator, 2, 16, QChar('0')).toLatin1(); // Skip mutating checks on shared strings - if (baDataPtr.d->isShared()) + if (baDataPtr->isShared()) return ba; const char *baData = ba.constData(); @@ -2168,7 +2168,7 @@ void tst_QByteArray::literals() QVERIFY(str.length() == 4); QVERIFY(str == "abcd"); - QVERIFY(str.data_ptr().d->isStatic()); + QVERIFY(str.data_ptr()->isStatic()); const char *s = str.constData(); QByteArray str2 = str; |