1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove traces of QDataStreamPrivate

Browse Source 
It's no longer used since 9b2835e464748f499758a7eef0d4c49452e7211a.

Pick-to: 6.9 6.8
Change-Id: I8a075e9d645290af3a7fe5b9b2fa7a5a7a7b4909
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2025-04-23 13:25:39 +02:00
parent eeead68995
commit 2471115715
4 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/CMakeLists.txt
View File

@ -204,7 +204,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

1
src/corelib/serialization/qdatastream.cpp
View File

@ -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"

5
src/corelib/serialization/qdatastream.h
View File

@ -29,7 +29,6 @@ class QIODevice;
class QString;
#if !defined(QT_NO_DATASTREAM)
class QDataStreamPrivate;
namespace QtPrivate {
class StreamStateSaver;
template <typename Container>
@ -219,7 +218,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;

32
src/corelib/serialization/qdatastream_p.h
View File

@ -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