From 1c573ba47c338f8f054e1a861d9298b5b2a53cec Mon Sep 17 00:00:00 2001 From: Alexander Akulich Date: Fri, 7 Feb 2020 15:53:04 +0300 Subject: QLocalSocket: Rename private errorOccurred method to setErrorAndEmit() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/network/socket/qlocalsocket_p.h | 4 ++-- src/network/socket/qlocalsocket_tcp.cpp | 10 +++++----- src/network/socket/qlocalsocket_unix.cpp | 28 ++++++++++++++-------------- 3 files changed, 21 insertions(+), 21 deletions(-) (limited to 'src/network/socket') diff --git a/src/network/socket/qlocalsocket_p.h b/src/network/socket/qlocalsocket_p.h index d93b53be0c..e3bcd92326 100644 --- a/src/network/socket/qlocalsocket_p.h +++ b/src/network/socket/qlocalsocket_p.h @@ -125,7 +125,7 @@ public: bool ownsTcpSocket; void setSocket(QLocalUnixSocket*); QString generateErrorString(QLocalSocket::LocalSocketError, const QString &function) const; - void errorOccurred(QLocalSocket::LocalSocketError, const QString &function); + void setErrorAndEmit(QLocalSocket::LocalSocketError, const QString &function); void _q_stateChanged(QAbstractSocket::SocketState newState); void _q_error(QAbstractSocket::SocketError newError); #elif defined(Q_OS_WIN) @@ -142,7 +142,7 @@ public: qint64 skip(qint64 maxSize) override; QLocalUnixSocket unixSocket; QString generateErrorString(QLocalSocket::LocalSocketError, const QString &function) const; - void errorOccurred(QLocalSocket::LocalSocketError, const QString &function); + void setErrorAndEmit(QLocalSocket::LocalSocketError, const QString &function); void _q_stateChanged(QAbstractSocket::SocketState newState); void _q_error(QAbstractSocket::SocketError newError); void _q_connectToSocket(); diff --git a/src/network/socket/qlocalsocket_tcp.cpp b/src/network/socket/qlocalsocket_tcp.cpp index 41e5b47627..b60fb74faf 100644 --- a/src/network/socket/qlocalsocket_tcp.cpp +++ b/src/network/socket/qlocalsocket_tcp.cpp @@ -168,7 +168,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) { @@ -231,8 +231,8 @@ 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; } @@ -246,8 +246,8 @@ void QLocalSocket::connectToServer(OpenMode openMode) bool ok; const quint16 port = settings.value(d->fullServerName).toUInt(&ok); if (!ok) { - d->errorOccurred(ServerNotFoundError, - QLatin1String("QLocalSocket::connectToServer")); + d->setErrorAndEmit(ServerNotFoundError, + QLatin1String("QLocalSocket::connectToServer")); return; } QIODevice::open(openMode); 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)); -- cgit v1.2.3