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_p.h | |
| 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_p.h')
| -rw-r--r-- | src/network/socket/qlocalsocket_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
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(); |