whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QDataStream: use NSDMI 

Just a little clean-up to avoid repetition.

Change-Id: I50e2158aeade4256ad1dfffd17b29a5b36c71ddc
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Thiago Macieira 2024-02-10 12:28:45 -08:00
parent 9b2835e464
commit 6dfc92abe8
2 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -271,12 +271,6 @@ constexpr quint32 QDataStream::ExtendedSize;
QDataStream::QDataStream()
{
dev = nullptr;
owndev = false;
byteorder = BigEndian;
ver = Qt_DefaultCompiledVersion;
noswap = QSysInfo::ByteOrder == QSysInfo::BigEndian;
q_status = Ok;
}
/*!
@ -288,11 +282,6 @@ QDataStream::QDataStream()
QDataStream::QDataStream(QIODevice *d)
{
dev = d; // set device
owndev = false;
byteorder = BigEndian; // default byte order
ver = Qt_DefaultCompiledVersion;
noswap = QSysInfo::ByteOrder == QSysInfo::BigEndian;
q_status = Ok;
}
/*!
@ -317,10 +306,6 @@ QDataStream::QDataStream(QByteArray *a, OpenMode flags)
buf->open(flags);
dev = buf;
owndev = true;
byteorder = BigEndian;
ver = Qt_DefaultCompiledVersion;
noswap = QSysInfo::ByteOrder == QSysInfo::BigEndian;
q_status = Ok;
}
/*!
@ -341,10 +326,6 @@ QDataStream::QDataStream(const QByteArray &a)
buf->open(QIODevice::ReadOnly);
dev = buf;
owndev = true;
byteorder = BigEndian;
ver = Qt_DefaultCompiledVersion;
noswap = QSysInfo::ByteOrder == QSysInfo::BigEndian;
q_status = Ok;
}
/*!

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

@ -216,13 +216,13 @@ private:
QScopedPointer<QDataStreamPrivate> d;
QIODevice *dev;
bool owndev;
bool noswap;
QIODevice *dev = nullptr;
bool owndev = false;
bool noswap = QSysInfo::ByteOrder == QSysInfo::BigEndian;
quint8 fpPrecision = QDataStream::DoublePrecision;
quint8 q_status;
ByteOrder byteorder;
int ver;
quint8 q_status = Ok;
ByteOrder byteorder = BigEndian;
int ver = Qt_DefaultCompiledVersion;
quint16 transactionDepth = 0;
#if QT_CORE_REMOVED_SINCE(6, 7)