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

QBufferPrivate: use NSDMI

Browse Source 
Removes some #ifdef'ery.

Also remove the unneeded dtor. While this is a polymophic class, it's
not in a header, so we won't run into the scenario described in
QTBUG-45582.

Pick-to: 6.3
Change-Id: I1a8598402ff2a564cc53da2f85ed3ed00ca3ddbf
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
This commit is contained in:
Marc Mutz 2022-04-04 15:06:36 +02:00
parent 5d6d127271
commit fa67208f8f
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/corelib/io/qbuffer.cpp
View File

@ -49,15 +49,9 @@ class QBufferPrivate : public QIODevicePrivate
Q_DECLARE_PUBLIC(QBuffer) Q_DECLARE_PUBLIC(QBuffer)
public: public:
QBufferPrivate() QBufferPrivate() = default;
: buf(nullptr)
#ifndef QT_NO_QOBJECT
, writtenSinceLastEmit(0), signalConnectionCount(0), signalsEmitted(false)
#endif
{ }
~QBufferPrivate() { }
QByteArray *buf; QByteArray *buf = nullptr;
QByteArray defaultBuf; QByteArray defaultBuf;
qint64 peek(char *data, qint64 maxSize) override; qint64 peek(char *data, qint64 maxSize) override;
@ -67,9 +61,9 @@ public:
// private slots // private slots
void _q_emitSignals(); void _q_emitSignals();
qint64 writtenSinceLastEmit; qint64 writtenSinceLastEmit = 0;
int signalConnectionCount; int signalConnectionCount = 0;
bool signalsEmitted; bool signalsEmitted = false;
#endif #endif
}; };