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_tcp.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_tcp.cpp')
-rw-r--r-- | src/network/socket/qlocalsocket_tcp.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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); |