From f8a53388a78ba70ed609df8738db9bc75e99af86 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Mon, 2 Dec 2019 16:06:48 +0100
Subject: Get rid of unused flags in QArrayData

Change-Id: I3ea754b44fb33e33baba0781d9ae15b7f3b3d8eb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp  |  9 ++++-----
 tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp | 17 +----------------
 2 files changed, 5 insertions(+), 21 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp
index 940865b98e..e566cc21a2 100644
--- a/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp
+++ b/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp
@@ -148,14 +148,13 @@ private slots:
     void stdString();
 };
 
-static const QArrayData staticDataFlags = { Q_BASIC_ATOMIC_INITIALIZER(-1), QArrayData::StaticDataFlags, 0 };
 static const QByteArray::DataPointer staticStandard = {
-    static_cast<QTypedArrayData<char> *>(const_cast<QArrayData *>(&staticDataFlags)),
+    nullptr,
     const_cast<char *>("data"),
     4
 };
 static const QByteArray::DataPointer staticNotNullTerminated = {
-    static_cast<QTypedArrayData<char> *>(const_cast<QArrayData *>(&staticDataFlags)),
+    nullptr,
     const_cast<char *>("dataBAD"),
     4
 };
@@ -168,8 +167,8 @@ 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->isStatic() || baDataPtr->flags() & QArrayData::RawDataType)
+    // Skip if isStatic() as those offer no guarantees
+    if (baDataPtr->isStatic())
         return ba;
 
     int baSize = ba.size();
diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
index 5be774cc53..5c7484a49a 100644
--- a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
+++ b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
@@ -83,7 +83,7 @@ void tst_QArrayData::referenceCounting()
 {
     {
         // Reference counting initialized to 1 (owned)
-        QArrayData array = { Q_BASIC_ATOMIC_INITIALIZER(1), QArrayData::DefaultRawFlags, 0 };
+        QArrayData array = { Q_BASIC_ATOMIC_INITIALIZER(1), 0, 0 };
 
         QCOMPARE(array.ref_.loadRelaxed(), 1);
 
@@ -106,21 +106,6 @@ void tst_QArrayData::referenceCounting()
 
         // Now would be a good time to free/release allocated data
     }
-    {
-        // Reference counting initialized to -1 (static read-only data)
-        QArrayData array = { Q_BASIC_ATOMIC_INITIALIZER(-1), QArrayData::StaticDataFlags, 0 };
-
-        QCOMPARE(array.ref_.loadRelaxed(), -1);
-
-        QVERIFY(array.isStatic());
-
-        QVERIFY(array.ref());
-        QCOMPARE(array.ref_.loadRelaxed(), -1);
-
-        QVERIFY(array.deref());
-        QCOMPARE(array.ref_.loadRelaxed(), -1);
-
-    }
 }
 
 void tst_QArrayData::sharedNullEmpty()
-- 
cgit v1.2.3