diff options
Diffstat (limited to 'src/corelib/io')
-rw-r--r-- | src/corelib/io/qiodevice.cpp | 16 | ||||
-rw-r--r-- | src/corelib/io/qiodevice_p.h | 46 |
2 files changed, 26 insertions, 36 deletions
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index b920fbb17b..d64c2f37cb 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -156,22 +156,6 @@ static void checkWarnMessage(const QIODevice *device, const char *function, cons \internal */ QIODevicePrivate::QIODevicePrivate() - : openMode(QIODevice::NotOpen), - pos(0), devicePos(0), - transactionPos(0), - readChannelCount(0), - writeChannelCount(0), - currentReadChannel(0), - currentWriteChannel(0), - readBufferChunkSize(QIODEVICE_BUFFERSIZE), - writeBufferChunkSize(0), - currentWriteChunk(nullptr), - transactionStarted(false) - , baseReadLineDataCalled(false) - , accessMode(Unset) -#ifdef QT_NO_QOBJECT - , q_ptr(nullptr) -#endif { } diff --git a/src/corelib/io/qiodevice_p.h b/src/corelib/io/qiodevice_p.h index a485ec43b3..8113f08237 100644 --- a/src/corelib/io/qiodevice_p.h +++ b/src/corelib/io/qiodevice_p.h @@ -80,11 +80,14 @@ public: QIODevicePrivate(); virtual ~QIODevicePrivate(); - QIODevice::OpenMode openMode; - QString errorString; - - QList<QRingBuffer> readBuffers; - QList<QRingBuffer> writeBuffers; + // The size of this class is a subject of the library hook data. + // When adding a new member, do not make gaps and be aware + // about the padding. Accordingly, adjust offsets in + // tests/auto/other/toolsupport and bump the TypeInformationVersion + // field in src/corelib/global/qhooks.cpp, to notify the developers. + qint64 pos = 0; + qint64 devicePos = 0; + qint64 transactionPos = 0; class QRingBufferRef { QRingBuffer *m_buf; @@ -122,27 +125,30 @@ public: QRingBufferRef buffer; QRingBufferRef writeBuffer; - qint64 pos; - qint64 devicePos; - qint64 transactionPos; - int readChannelCount; - int writeChannelCount; - int currentReadChannel; - int currentWriteChannel; - int readBufferChunkSize; - int writeBufferChunkSize; - const QByteArray *currentWriteChunk; - bool transactionStarted; - bool baseReadLineDataCalled; + const QByteArray *currentWriteChunk = nullptr; + int readChannelCount = 0; + int writeChannelCount = 0; + int currentReadChannel = 0; + int currentWriteChannel = 0; + int readBufferChunkSize = QIODEVICE_BUFFERSIZE; + int writeBufferChunkSize = 0; + + QList<QRingBuffer> readBuffers; + QList<QRingBuffer> writeBuffers; + QString errorString; + QIODevice::OpenMode openMode = QIODevice::NotOpen; + + bool transactionStarted = false; + bool baseReadLineDataCalled = false; virtual bool putCharHelper(char c); - enum AccessMode { + enum AccessMode : quint8 { Unset, Sequential, RandomAccess }; - mutable AccessMode accessMode; + mutable AccessMode accessMode = Unset; inline bool isSequential() const { if (accessMode == Unset) @@ -179,7 +185,7 @@ public: void write(const char *data, qint64 size); #ifdef QT_NO_QOBJECT - QIODevice *q_ptr; + QIODevice *q_ptr = nullptr; #endif }; |