From 2a626976451d6d9c7c7f733d9899d316056bd027 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Wed, 23 Apr 2025 13:25:39 +0200
Subject: [PATCH] Remove traces of QDataStreamPrivate

It's no longer used since 9b2835e464748f499758a7eef0d4c49452e7211a.

Pick-to: 6.8
Change-Id: I8a075e9d645290af3a7fe5b9b2fa7a5a7a7b4909
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 2471115715de2a00d477b35de69fcdb5e1cdf65d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/corelib/CMakeLists.txt                |  2 +-
 src/corelib/serialization/qdatastream.cpp |  1 -
 src/corelib/serialization/qdatastream.h   |  5 ++--
 src/corelib/serialization/qdatastream_p.h | 32 -----------------------
 4 files changed, 4 insertions(+), 36 deletions(-)
 delete mode 100644 src/corelib/serialization/qdatastream_p.h

diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 578103bcb7b..064dba4efae 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -201,7 +201,7 @@ qt_internal_add_module(Core
         serialization/qcbormap.h
         serialization/qcborstream.h
         serialization/qcborvalue.cpp serialization/qcborvalue.h serialization/qcborvalue_p.h
-        serialization/qdatastream.cpp serialization/qdatastream.h serialization/qdatastream_p.h
+        serialization/qdatastream.cpp serialization/qdatastream.h
         serialization/qjson_p.h
         serialization/qjsonarray.cpp serialization/qjsonarray.h
         serialization/qjsoncbor.cpp
diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp
index 0b9c16ff0af..d7fa36ac983 100644
--- a/src/corelib/serialization/qdatastream.cpp
+++ b/src/corelib/serialization/qdatastream.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qdatastream.h"
-#include "qdatastream_p.h"
 
 #if !defined(QT_NO_DATASTREAM) || defined(QT_BOOTSTRAPPED)
 #include "qbuffer.h"
diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h
index 80bd971ba34..6f63b47e6b4 100644
--- a/src/corelib/serialization/qdatastream.h
+++ b/src/corelib/serialization/qdatastream.h
@@ -28,7 +28,6 @@ class QIODevice;
 class QString;
 
 #if !defined(QT_NO_DATASTREAM)
-class QDataStreamPrivate;
 namespace QtPrivate {
 class StreamStateSaver;
 template <typename Container>
@@ -217,7 +216,9 @@ public:
 private:
     Q_DISABLE_COPY(QDataStream)
 
-    std::unique_ptr<QDataStreamPrivate> d;
+#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0)
+    void* const d = nullptr;
+#endif
 
     QIODevice *dev = nullptr;
     bool owndev = false;
diff --git a/src/corelib/serialization/qdatastream_p.h b/src/corelib/serialization/qdatastream_p.h
deleted file mode 100644
index c4fe7c784cf..00000000000
--- a/src/corelib/serialization/qdatastream_p.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-#ifndef QDATASTREAM_P_H
-#define QDATASTREAM_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/private/qglobal_p.h>
-#include <qdatastream.h>
-
-QT_BEGIN_NAMESPACE
-
-#if !defined(QT_NO_DATASTREAM) || defined(QT_BOOTSTRAPPED)
-class QDataStreamPrivate
-{
-public:
-};
-#endif
-
-QT_END_NAMESPACE
-
-#endif // QDATASTREAM_P_H