From 071716f2daebaebab562b7f49c29f281c5536bbc Mon Sep 17 00:00:00 2001
From: Alex Trotsenko <alex1973tr@gmail.com>
Date: Wed, 24 Sep 2014 18:45:42 +0300
Subject: QAbstractSocket: remove unneeded cleanup calls and private member

QAbstractSocket::close() always calls QIODevice::close(), which resets
QIODevice's internal read buffer. So it makes no sense to make same calls
from disconnectFromHost(). This made the closeCalled private member
superfluous.

Change-Id: I4ec64e9711490e44e737763e4ed7fb41bffe2556
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/network/socket/qabstractsocket.cpp | 15 ++-------------
 src/network/socket/qabstractsocket_p.h |  1 -
 2 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'src/network')

diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 2557213420..76874823f0 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -549,7 +549,6 @@ QAbstractSocketPrivate::QAbstractSocketPrivate()
       emittedReadyRead(false),
       emittedBytesWritten(false),
       abortCalled(false),
-      closeCalled(false),
       pendingClose(false),
       pauseMode(QAbstractSocket::PauseNever),
       port(0),
@@ -1610,7 +1609,6 @@ void QAbstractSocket::connectToHost(const QString &hostName, quint16 port,
     d->buffer.clear();
     d->writeBuffer.clear();
     d->abortCalled = false;
-    d->closeCalled = false;
     d->pendingClose = false;
     d->localPort = 0;
     d->peerPort = 0;
@@ -2650,10 +2648,8 @@ void QAbstractSocket::close()
     qDebug("QAbstractSocket::close()");
 #endif
     QIODevice::close();
-    if (d->state != UnconnectedState) {
-        d->closeCalled = true;
+    if (d->state != UnconnectedState)
         disconnectFromHost();
-    }
 
     d->localPort = 0;
     d->peerPort = 0;
@@ -2763,19 +2759,12 @@ void QAbstractSocket::disconnectFromHost()
     d->peerPort = 0;
     d->localAddress.clear();
     d->peerAddress.clear();
+    d->writeBuffer.clear();
 
 #if defined(QABSTRACTSOCKET_DEBUG)
         qDebug("QAbstractSocket::disconnectFromHost() disconnected!");
 #endif
 
-    if (d->closeCalled) {
-#if defined(QABSTRACTSOCKET_DEBUG)
-        qDebug("QAbstractSocket::disconnectFromHost() closed!");
-#endif
-        d->buffer.clear();
-        d->writeBuffer.clear();
-        QIODevice::close();
-    }
 }
 
 /*!
diff --git a/src/network/socket/qabstractsocket_p.h b/src/network/socket/qabstractsocket_p.h
index 218f93a504..379657f4fa 100644
--- a/src/network/socket/qabstractsocket_p.h
+++ b/src/network/socket/qabstractsocket_p.h
@@ -97,7 +97,6 @@ public:
     bool emittedBytesWritten;
 
     bool abortCalled;
-    bool closeCalled;
     bool pendingClose;
 
     QAbstractSocket::PauseModes pauseMode;
-- 
cgit v1.2.3