AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QAbstractSocketPrivate: Initialize members in-class

Browse Source 
Change-Id: I267b5037801f226379a154731be9ef81cccb828e
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Mårten Nordheim 2022-02-08 17:32:19 +01:00
parent 50c8ec9fa4
commit 4fe79a23cd
2 changed files with 20 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/network/socket/qabstractsocket.cpp
View File

@ -522,25 +522,6 @@ static bool isProxyError(QAbstractSocket::SocketError error)
Constructs a QAbstractSocketPrivate. Initializes all members.
*/
QAbstractSocketPrivate::QAbstractSocketPrivate()
: emittedReadyRead(false),
emittedBytesWritten(false),
abortCalled(false),
pendingClose(false),
pauseMode(QAbstractSocket::PauseNever),
port(0),
localPort(0),
peerPort(0),
socketEngine(nullptr),
cachedSocketDescriptor(-1),
readBufferMaxSize(0),
isBuffered(false),
hasPendingData(false),
connectTimer(nullptr),
hostLookupId(-1),
socketType(QAbstractSocket::UnknownSocketType),
state(QAbstractSocket::UnconnectedState),
socketError(QAbstractSocket::UnknownSocketError),
preferredNetworkLayerProtocol(QAbstractSocket::UnknownNetworkLayerProtocol)
{
writeBufferChunkSize = QABSTRACTSOCKET_BUFFERSIZE;
}

39
src/network/socket/qabstractsocket_p.h
View File

@ -96,27 +96,27 @@ public:
void _q_testConnection();
void _q_abortConnectionAttempt();
bool emittedReadyRead;
bool emittedBytesWritten;
bool emittedReadyRead = false;
bool emittedBytesWritten = false;
bool abortCalled;
bool pendingClose;
bool abortCalled = false;
bool pendingClose = false;
QAbstractSocket::PauseModes pauseMode;
QAbstractSocket::PauseModes pauseMode = QAbstractSocket::PauseNever;
QString hostName;
quint16 port;
quint16 port = 0;
QHostAddress host;
QList<QHostAddress> addresses;
quint16 localPort;
quint16 peerPort;
quint16 localPort = 0;
quint16 peerPort = 0;
QHostAddress localAddress;
QHostAddress peerAddress;
QString peerName;
QAbstractSocketEngine *socketEngine;
qintptr cachedSocketDescriptor;
QAbstractSocketEngine *socketEngine = nullptr;
qintptr cachedSocketDescriptor = -1;
#ifndef QT_NO_NETWORKPROXY
QNetworkProxy proxy;
@ -143,21 +143,22 @@ public:
void setError(QAbstractSocket::SocketError errorCode, const QString &errorString);
void setErrorAndEmit(QAbstractSocket::SocketError errorCode, const QString &errorString);
qint64 readBufferMaxSize;
bool isBuffered;
bool hasPendingData;
qint64 readBufferMaxSize = 0;
bool isBuffered = false;
bool hasPendingData = false;
QTimer *connectTimer;
QTimer *connectTimer = nullptr;
int hostLookupId;
int hostLookupId = -1;
QAbstractSocket::SocketType socketType;
QAbstractSocket::SocketState state;
QAbstractSocket::SocketType socketType = QAbstractSocket::UnknownSocketType;
QAbstractSocket::SocketState state = QAbstractSocket::UnconnectedState;
// Must be kept in sync with QIODevicePrivate::errorString.
QAbstractSocket::SocketError socketError;
QAbstractSocket::SocketError socketError = QAbstractSocket::UnknownSocketError;
QAbstractSocket::NetworkLayerProtocol preferredNetworkLayerProtocol;
QAbstractSocket::NetworkLayerProtocol preferredNetworkLayerProtocol =
QAbstractSocket::UnknownNetworkLayerProtocol;
bool prePauseReadSocketNotifierState = false;
bool prePauseWriteSocketNotifierState = false;