From c08b0cec2f3acc29e86beba4b1de26caf04bebfd Mon Sep 17 00:00:00 2001 From: Alexander Akulich Date: Fri, 7 Feb 2020 16:12:27 +0300 Subject: QLocalSocket: Deprecate 'error' signal, use 'errorOccurred' instead MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ChangeLog][Deprecation Notice] QLocalSocket::error() (the signal) is deprecated; superseded by errorOccurred() Change-Id: I579c07564f5c470cf2867864755e0a26e6afce3b Reviewed-by: Mårten Nordheim --- src/network/socket/qlocalsocket_unix.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/network/socket/qlocalsocket_unix.cpp') 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; } -- cgit v1.2.3