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

QAbstractSocket: remove unused 'connectTimeElapsed' member

Browse Source 
Change-Id: If73198fb034b6a52b5081379a2bc69052d307454
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Alex Trotsenko 2016-01-05 12:04:08 +02:00
parent 9d6a4e7094
commit 9f74b840f9
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -561,7 +561,6 @@ QAbstractSocketPrivate::QAbstractSocketPrivate()
isBuffered(false),
connectTimer(0),
disconnectTimer(0),
connectTimeElapsed(0),
hostLookupId(-1),
socketType(QAbstractSocket::UnknownSocketType),
state(QAbstractSocket::UnconnectedState),
@ -970,8 +969,6 @@ void QAbstractSocketPrivate::startConnectingByName(const QString &host)
state = QAbstractSocket::ConnectingState;
emit q->stateChanged(state);
connectTimeElapsed = 0;
if (cachedSocketDescriptor != -1 || initSocketLayer(QAbstractSocket::UnknownNetworkLayerProtocol)) {
if (socketEngine->connectToHostByName(host, port) ||
socketEngine->state() == QAbstractSocket::ConnectingState) {
@ -1054,9 +1051,6 @@ void QAbstractSocketPrivate::_q_startConnecting(const QHostInfo &hostInfo)
// Report the successful host lookup
emit q->hostFound();
// Reset the total time spent connecting.
connectTimeElapsed = 0;
// The addresses returned by the lookup will be tested one after
// another by _q_connectToNextAddress().
_q_connectToNextAddress();

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

@ -148,7 +148,6 @@ public:
QTimer *connectTimer;
QTimer *disconnectTimer;
int connectTimeElapsed;
int hostLookupId;