diff options
| author | Alex Trotsenko <alex1973tr@gmail.com> | 2016-01-08 16:58:24 +0200 |
|---|---|---|
| committer | Alex Trotsenko <alex1973tr@gmail.com> | 2016-01-12 06:37:55 +0000 |
| commit | 962a1fe892bd27e053157612f4b3c8bf2f136018 (patch) | |
| tree | 84024cdf1236e552f6b03b6c47d7c630f7e52478 /src | |
| parent | 13337c505d23a2883ef68f7c6d714b27dda993ab (diff) | |
QAbstractSocket::writeData(): remove dead code
The code was checking the write buffer in a branch for unbuffered sockets.
Change-Id: I4dc722e7f182562332c3d167e6ebbab7f53f51e7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 826ba6f3f9..1ed72e90d7 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -2490,11 +2490,8 @@ qint64 QAbstractSocket::writeData(const char *data, qint64 size) } else if (!d->isBuffered && d->socketType != TcpSocket) { // This is for a QUdpSocket that was connect()ed qint64 written = d->socketEngine->write(data, size); - if (written < 0) { + if (written < 0) d->setError(d->socketEngine->error(), d->socketEngine->errorString()); - } else if (!d->writeBuffer.isEmpty()) { - d->socketEngine->setWriteNotificationEnabled(true); - } #if defined (QABSTRACTSOCKET_DEBUG) qDebug("QAbstractSocket::writeData(%p \"%s\", %lli) == %lli", data, |