Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 19:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

properly initialize QDataStream members

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-01-05 05:23:26 +02:00
parent 2fb26c74a6
commit d129064020
1 changed files with 28 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/core/io/qdatastream.cpp
View file

@ -224,7 +224,6 @@ QT_BEGIN_NAMESPACE
QDataStream member functions QDataStream member functions
*****************************************************************************/ *****************************************************************************/
#undef CHECK_STREAM_PRECOND
#ifndef QT_NO_DEBUG #ifndef QT_NO_DEBUG
#define CHECK_STREAM_PRECOND(retVal) \ #define CHECK_STREAM_PRECOND(retVal) \
if (!dev) { \ if (!dev) { \
@ -253,14 +252,14 @@ QT_BEGIN_NAMESPACE
*/ */
QDataStream::QDataStream() QDataStream::QDataStream()
: d(Q_NULLPTR),
dev(Q_NULLPTR),
owndev(false),
noswap(QSysInfo::ByteOrder == QSysInfo::BigEndian),
byteorder(QDataStream::BigEndian),
ver(QDataStream::Qt_Default),
q_status(QDataStream::Ok)
{ {
d = Q_NULLPTR;
dev = 0;
owndev = false;
byteorder = BigEndian;
ver = QDataStream::Qt_Default;
noswap = QSysInfo::ByteOrder == QSysInfo::BigEndian;
q_status = Ok;
} }
/*! /*!
@ -276,14 +275,14 @@ QDataStream::QDataStream()
*/ */
QDataStream::QDataStream(QIODevice *device) QDataStream::QDataStream(QIODevice *device)
: d(Q_NULLPTR),
dev(device),
owndev(false),
noswap(QSysInfo::ByteOrder == QSysInfo::BigEndian),
byteorder(QDataStream::BigEndian),
ver(QDataStream::Qt_Default),
q_status(QDataStream::Ok)
{ {
d = Q_NULLPTR;
dev = device; // set device
owndev = false;
byteorder = BigEndian; // default byte order
ver = QDataStream::Qt_Default;
noswap = QSysInfo::ByteOrder == QSysInfo::BigEndian;
q_status = Ok;
} }
@ -301,8 +300,14 @@ QDataStream::QDataStream(QIODevice *device)
*/ */
QDataStream::QDataStream(QByteArray *a, QIODevice::OpenMode flags) QDataStream::QDataStream(QByteArray *a, QIODevice::OpenMode flags)
: d(Q_NULLPTR),
dev(Q_NULLPTR),
owndev(false),
noswap(QSysInfo::ByteOrder == QSysInfo::BigEndian),
byteorder(QDataStream::BigEndian),
ver(QDataStream::Qt_Default),
q_status(QDataStream::Ok)
{ {
d = Q_NULLPTR;
QBuffer *buf = new QBuffer(a); QBuffer *buf = new QBuffer(a);
#ifndef QT_NO_QOBJECT #ifndef QT_NO_QOBJECT
buf->blockSignals(true); buf->blockSignals(true);
@ -310,10 +315,6 @@ QDataStream::QDataStream(QByteArray *a, QIODevice::OpenMode flags)
buf->open(flags); buf->open(flags);
dev = buf; dev = buf;
owndev = true; owndev = true;
byteorder = BigEndian;
ver = QDataStream::Qt_Default;
noswap = QSysInfo::ByteOrder == QSysInfo::BigEndian;
q_status = Ok;
} }
/*! /*!
@ -325,8 +326,14 @@ QDataStream::QDataStream(QByteArray *a, QIODevice::OpenMode flags)
is created to wrap the byte array. is created to wrap the byte array.
*/ */
QDataStream::QDataStream(const QByteArray &a) QDataStream::QDataStream(const QByteArray &a)
: d(Q_NULLPTR),
dev(Q_NULLPTR),
owndev(false),
noswap(QSysInfo::ByteOrder == QSysInfo::BigEndian),
byteorder(QDataStream::BigEndian),
ver(QDataStream::Qt_Default),
q_status(QDataStream::Ok)
{ {
d = Q_NULLPTR;
QBuffer *buf = new QBuffer; QBuffer *buf = new QBuffer;
#ifndef QT_NO_QOBJECT #ifndef QT_NO_QOBJECT
buf->blockSignals(true); buf->blockSignals(true);
@ -335,10 +342,6 @@ QDataStream::QDataStream(const QByteArray &a)
buf->open(QIODevice::ReadOnly); buf->open(QIODevice::ReadOnly);
dev = buf; dev = buf;
owndev = true; owndev = true;
byteorder = BigEndian;
ver = QDataStream::Qt_Default;
noswap = QSysInfo::ByteOrder == QSysInfo::BigEndian;
q_status = Ok;
} }
/*! /*!