diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-07-10 16:10:44 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-09-14 09:38:24 +0000 |
| commit | a8bc96e9e5d18908d266e3dc614c00f25a0c2013 (patch) | |
| tree | 867538774043a6e76640a9aa68775f9dee997b37 /src/network/socket/qudpsocket.cpp | |
| parent | b1738d63298ef1850995d13e9f7c8bcc6156edc1 (diff) | |
QAbstractSocket: Consolidate error reporting
Introduce the methods setError(), setErrorAndEmit() to consistently
set the internal error state.
Change-Id: I4ff951d100cf5e9f9a7e27135bb52188cde99853
Reviewed-by: Alex Trotsenko <alex1973tr@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/network/socket/qudpsocket.cpp')
| -rw-r--r-- | src/network/socket/qudpsocket.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/network/socket/qudpsocket.cpp b/src/network/socket/qudpsocket.cpp index f4e7d20b03..a46e6ade04 100644 --- a/src/network/socket/qudpsocket.cpp +++ b/src/network/socket/qudpsocket.cpp @@ -339,9 +339,7 @@ qint64 QUdpSocket::writeDatagram(const char *data, qint64 size, const QHostAddre if (sent >= 0) { emit bytesWritten(sent); } else { - d->socketError = d->socketEngine->error(); - setErrorString(d->socketEngine->errorString()); - emit error(d->socketError); + d->setErrorAndEmit(d->socketEngine->error(), d->socketEngine->errorString()); } return sent; } @@ -394,11 +392,8 @@ qint64 QUdpSocket::readDatagram(char *data, qint64 maxSize, QHostAddress *addres } d_func()->socketEngine->setReadNotificationEnabled(true); - if (readBytes < 0) { - d->socketError = d->socketEngine->error(); - setErrorString(d->socketEngine->errorString()); - emit error(d->socketError); - } + if (readBytes < 0) + d->setErrorAndEmit(d->socketEngine->error(), d->socketEngine->errorString()); return readBytes; } #endif // QT_NO_UDPSOCKET |