diff options
| author | Alexander Akulich <akulichalexander@gmail.com> | 2020-02-07 16:12:27 +0300 |
|---|---|---|
| committer | Alexander Akulich <akulichalexander@gmail.com> | 2020-02-11 16:54:59 +0300 |
| commit | c08b0cec2f3acc29e86beba4b1de26caf04bebfd (patch) | |
| tree | c6adf5fce21ac8d3e06440aa325818a0f689e6b6 /src/network/socket/qlocalsocket_unix.cpp | |
| parent | 1c573ba47c338f8f054e1a861d9298b5b2a53cec (diff) | |
QLocalSocket: Deprecate 'error' signal, use 'errorOccurred' insteadv5.15.0-alpha1
[ChangeLog][Deprecation Notice] QLocalSocket::error() (the signal) is deprecated; superseded by errorOccurred()
Change-Id: I579c07564f5c470cf2867864755e0a26e6afce3b
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/socket/qlocalsocket_unix.cpp b/src/network/socket/qlocalsocket_unix.cpp index 74819f697b..e860b880d5 100644 --- a/src/network/socket/qlocalsocket_unix.cpp +++ b/src/network/socket/qlocalsocket_unix.cpp @@ -99,7 +99,7 @@ void QLocalSocketPrivate::_q_error(QAbstractSocket::SocketError socketError) QLocalSocket::LocalSocketError error = (QLocalSocket::LocalSocketError)socketError; QString errorString = generateErrorString(error, function); q->setErrorString(errorString); - emit q->error(error); + emit q->errorOccurred(error); } void QLocalSocketPrivate::_q_stateChanged(QAbstractSocket::SocketState newState) @@ -210,7 +210,7 @@ void QLocalSocketPrivate::setErrorAndEmit(QLocalSocket::LocalSocketError error, QString errorString = generateErrorString(error, function); q->setErrorString(errorString); - emit q->error(error); + emit q->errorOccurred(error); // errors cause a disconnect unixSocket.setSocketState(QAbstractSocket::UnconnectedState); @@ -227,7 +227,7 @@ void QLocalSocket::connectToServer(OpenMode openMode) if (state() == ConnectedState || state() == ConnectingState) { QString errorString = d->generateErrorString(QLocalSocket::OperationError, QLatin1String("QLocalSocket::connectToserver")); setErrorString(errorString); - emit error(QLocalSocket::OperationError); + emit errorOccurred(QLocalSocket::OperationError); return; } |