diff options
author | Alexander Akulich <akulichalexander@gmail.com> | 2020-02-07 15:53:04 +0300 |
---|---|---|
committer | Alexander Akulich <akulichalexander@gmail.com> | 2020-02-11 16:54:50 +0300 |
commit | 1c573ba47c338f8f054e1a861d9298b5b2a53cec (patch) | |
tree | 88011637e8428e93de84f28f0f21ae65caa28d37 /src/network/socket/qlocalsocket_unix.cpp | |
parent | c034f92fc2e377f47a0f45efeb66905a0f45d0ae (diff) |
QLocalSocket: Rename private errorOccurred method to setErrorAndEmit()
The method named like a signal and can lead to confusion especially
if such a signal will be added.
The new name taken from QAbstractSocketPrivate::setErrorAndEmit(),
though in QLocalSocket the method is NOT the only place of the error
set and the signal emission.
Change-Id: I7cdc487a39ec290203cced7359527f888342a0ad
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/socket/qlocalsocket_unix.cpp')
-rw-r--r-- | src/network/socket/qlocalsocket_unix.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/network/socket/qlocalsocket_unix.cpp b/src/network/socket/qlocalsocket_unix.cpp index 55bdd12748..74819f697b 100644 --- a/src/network/socket/qlocalsocket_unix.cpp +++ b/src/network/socket/qlocalsocket_unix.cpp @@ -172,7 +172,7 @@ QString QLocalSocketPrivate::generateErrorString(QLocalSocket::LocalSocketError return errorString; } -void QLocalSocketPrivate::errorOccurred(QLocalSocket::LocalSocketError error, const QString &function) +void QLocalSocketPrivate::setErrorAndEmit(QLocalSocket::LocalSocketError error, const QString &function) { Q_Q(QLocalSocket); switch (error) { @@ -237,15 +237,15 @@ void QLocalSocket::connectToServer(OpenMode openMode) emit stateChanged(d->state); if (d->serverName.isEmpty()) { - d->errorOccurred(ServerNotFoundError, - QLatin1String("QLocalSocket::connectToServer")); + d->setErrorAndEmit(ServerNotFoundError, + QLatin1String("QLocalSocket::connectToServer")); return; } // create the socket if (-1 == (d->connectingSocket = qt_safe_socket(PF_UNIX, SOCK_STREAM, 0, O_NONBLOCK))) { - d->errorOccurred(UnsupportedSocketOperationError, - QLatin1String("QLocalSocket::connectToServer")); + d->setErrorAndEmit(UnsupportedSocketOperationError, + QLatin1String("QLocalSocket::connectToServer")); return; } @@ -281,7 +281,7 @@ void QLocalSocketPrivate::_q_connectToSocket() name.sun_family = PF_UNIX; if (sizeof(name.sun_path) < (uint)encodedConnectingPathName.size() + 1) { QString function = QLatin1String("QLocalSocket::connectToServer"); - errorOccurred(QLocalSocket::ServerNotFoundError, function); + setErrorAndEmit(QLocalSocket::ServerNotFoundError, function); return; } ::memcpy(name.sun_path, encodedConnectingPathName.constData(), @@ -292,17 +292,17 @@ void QLocalSocketPrivate::_q_connectToSocket() { case EINVAL: case ECONNREFUSED: - errorOccurred(QLocalSocket::ConnectionRefusedError, function); + setErrorAndEmit(QLocalSocket::ConnectionRefusedError, function); break; case ENOENT: - errorOccurred(QLocalSocket::ServerNotFoundError, function); + setErrorAndEmit(QLocalSocket::ServerNotFoundError, function); break; case EACCES: case EPERM: - errorOccurred(QLocalSocket::SocketAccessError, function); + setErrorAndEmit(QLocalSocket::SocketAccessError, function); break; case ETIMEDOUT: - errorOccurred(QLocalSocket::SocketTimeoutError, function); + setErrorAndEmit(QLocalSocket::SocketTimeoutError, function); break; case EAGAIN: // Try again later, all of the sockets listening are full @@ -320,7 +320,7 @@ void QLocalSocketPrivate::_q_connectToSocket() delayConnect->setEnabled(true); break; default: - errorOccurred(QLocalSocket::UnknownSocketError, function); + setErrorAndEmit(QLocalSocket::UnknownSocketError, function); } return; } @@ -336,7 +336,7 @@ void QLocalSocketPrivate::_q_connectToSocket() q->emit connected(); } else { QString function = QLatin1String("QLocalSocket::connectToServer"); - errorOccurred(QLocalSocket::UnknownSocketError, function); + setErrorAndEmit(QLocalSocket::UnknownSocketError, function); } connectingSocket = -1; connectingName.clear(); @@ -529,8 +529,8 @@ bool QLocalSocket::waitForConnected(int msec) const int result = qt_poll_msecs(&pfd, 1, timeout); if (result == -1) - d->errorOccurred(QLocalSocket::UnknownSocketError, - QLatin1String("QLocalSocket::waitForConnected")); + d->setErrorAndEmit(QLocalSocket::UnknownSocketError, + QLatin1String("QLocalSocket::waitForConnected")); else if (result > 0) d->_q_connectToSocket(); } while (state() == ConnectingState && !timer.hasExpired(msec)); |