Revert "QLocalSocket - deprecate ambiguous 'error' overloads"

This reverts commit 0de6c26ac17c90f513329fdbe87ef036fc25925a.

The patch fixes ambiguity between a getter and a signal by changing the
getter name, but we still have to rename the signal to follow the signals
naming convention.

Revert the commit to keep the getter as is and change the signal name instead.

Change-Id: I67dbb5cada25da473bdd02e71b1e2d9bd03f039e
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

src/network/socket/qlocalsocket.cpp

@@ -220,25 +220,11 @@ QT_BEGIN_NAMESPACE
 /*!
     \fn QLocalSocket::LocalSocketError QLocalSocket::error() const
 
-    \deprecated
-
-    Use socketError() instead.
-
-    Returns the type of error that last occurred.
-
-    \sa state(), errorString(), socketError()
-*/
-
-/*!
-    \fn QLocalSocket::LocalSocketError QLocalSocket::socketError() const
-    \since 5.15
-
     Returns the type of error that last occurred.
 
     \sa state(), errorString()
 */
 
-
 /*!
     \fn bool QLocalSocket::isValid() const
 
@@ -286,7 +272,7 @@ QT_BEGIN_NAMESPACE
     Waits until the socket is connected, up to \a msecs milliseconds. If the
     connection has been established, this function returns \c true; otherwise
     it returns \c false. In the case where it returns \c false, you can call
-    socketError() to determine the cause of the error.
+    error() to determine the cause of the error.
 
     The following example waits up to one second for a connection
     to be established:
@@ -305,7 +291,7 @@ QT_BEGIN_NAMESPACE
     connection was successfully disconnected, this function returns \c true;
     otherwise it returns \c false (if the operation timed out, if an error
     occurred, or if this QLocalSocket is already disconnected). In the case
-    where it returns \c false, you can call socketError() to determine the cause of
+    where it returns \c false, you can call error() to determine the cause of
     the error.
 
     The following example waits up to one second for a connection
@@ -351,7 +337,7 @@ QT_BEGIN_NAMESPACE
     connections, you will have to register it with Q_DECLARE_METATYPE() and
     qRegisterMetaType().
 
-    \sa socketError(), errorString(), {Creating Custom Qt Types}
+    \sa error(), errorString(), {Creating Custom Qt Types}
 */
 
 /*!
@@ -460,7 +446,7 @@ QString QLocalSocket::fullServerName() const
 /*!
     Returns the state of the socket.
 
-    \sa socketError()
+    \sa error()
  */
 QLocalSocket::LocalSocketState QLocalSocket::state() const
 {
@@ -480,7 +466,7 @@ bool QLocalSocket::isSequential() const
 
     The LocalServerError enumeration represents the errors that can occur.
     The most recent error can be retrieved through a call to
-    \l QLocalSocket::socketError().
+    \l QLocalSocket::error().
 
     \value ConnectionRefusedError The connection was refused by
         the peer (or timed out).

src/network/socket/qlocalsocket.h

@@ -97,12 +97,7 @@ public:
     virtual bool canReadLine() const override;
     virtual bool open(OpenMode openMode = ReadWrite) override;
     virtual void close() override;
-
+    LocalSocketError error() const;
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_X("Use socketError()") LocalSocketError error() const;
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
-    LocalSocketError socketError() const;
     bool flush();
     bool isValid() const;
     qint64 readBufferSize() const;

src/network/socket/qlocalsocket_tcp.cpp

@@ -363,14 +363,7 @@ void QLocalSocket::disconnectFromServer()
     d->tcpSocket->disconnectFromHost();
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
 QLocalSocket::LocalSocketError QLocalSocket::error() const
-{
-    return socketError();
-}
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
-QLocalSocket::LocalSocketError QLocalSocket::socketError() const
 {
     Q_D(const QLocalSocket);
     switch (d->tcpSocket->error()) {

src/network/socket/qlocalsocket_unix.cpp

@@ -461,14 +461,7 @@ void QLocalSocket::disconnectFromServer()
     d->unixSocket.disconnectFromHost();
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
 QLocalSocket::LocalSocketError QLocalSocket::error() const
-{
-    return socketError();
-}
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
-QLocalSocket::LocalSocketError QLocalSocket::socketError() const
 {
     Q_D(const QLocalSocket);
     switch (d->unixSocket.socketError()) {

src/network/socket/qlocalsocket_win.cpp

@@ -330,14 +330,7 @@ void QLocalSocket::disconnectFromServer()
     }
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
 QLocalSocket::LocalSocketError QLocalSocket::error() const
-{
-    return socketError();
-}
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
-QLocalSocket::LocalSocketError QLocalSocket::socketError() const
 {
     Q_D(const QLocalSocket);
     return d->error;

tests/auto/network/socket/qlocalsocket/socketprocess/main.cpp

@@ -65,8 +65,8 @@ bool runServer(int numberOfConnections)
             return false;
         }
         printf("server: data written\n");
-        if (socket->socketError() != QLocalSocket::UnknownSocketError) {
+        if (socket->error() != QLocalSocket::UnknownSocketError) {
-            fprintf(stderr, "server: socket error %d\n", socket->socketError());
+            fprintf(stderr, "server: socket error %d\n", socket->error());
             return false;
         }
     }
@@ -83,8 +83,8 @@ bool runClient()
         socket.connectToServer(serverName, QLocalSocket::ReadWrite);
         if (socket.waitForConnected())
             break;
-        if (socket.socketError() == QLocalSocket::ServerNotFoundError
+        if (socket.error() == QLocalSocket::ServerNotFoundError
-            || socket.socketError() == QLocalSocket::ConnectionRefusedError) {
+            || socket.error() == QLocalSocket::ConnectionRefusedError) {
             if (connectTimer.elapsed() > 5000) {
                 fprintf(stderr, "client: server not found or connection refused. Giving up.\n");
                 return false;

tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp

@@ -195,7 +195,7 @@ private slots:
     void slotError(QLocalSocket::LocalSocketError newError)
     {
         QVERIFY(errorString() != QLatin1String("Unknown error"));
-        QCOMPARE(socketError(), newError);
+        QCOMPARE(error(), newError);
     }
     void slotStateChanged(QLocalSocket::LocalSocketState newState)
     {
@@ -256,7 +256,7 @@ void tst_QLocalSocket::socket_basic()
     QCOMPARE(socket.canReadLine(), false);
     socket.close();
     socket.disconnectFromServer();
-    QCOMPARE(QLocalSocket::UnknownSocketError, socket.socketError());
+    QCOMPARE(QLocalSocket::UnknownSocketError, socket.error());
     QVERIFY(!socket.errorString().isEmpty());
     QCOMPARE(socket.flush(), false);
     QCOMPARE(socket.isValid(), false);
@@ -375,13 +375,13 @@ void tst_QLocalSocket::listenAndConnect()
             QVERIFY(socket->waitForConnected());
             QVERIFY(socket->isValid());
             QCOMPARE(socket->errorString(), QString("Unknown error"));
-            QCOMPARE(socket->socketError(), QLocalSocket::UnknownSocketError);
+            QCOMPARE(socket->error(), QLocalSocket::UnknownSocketError);
             QCOMPARE(socket->state(), QLocalSocket::ConnectedState);
             //QVERIFY(socket->socketDescriptor() != -1);
             QCOMPARE(spyError.count(), 0);
         } else {
             QVERIFY(!socket->errorString().isEmpty());
-            QVERIFY(socket->socketError() != QLocalSocket::UnknownSocketError);
+            QVERIFY(socket->error() != QLocalSocket::UnknownSocketError);
             QCOMPARE(socket->state(), QLocalSocket::UnconnectedState);
             //QCOMPARE(socket->socketDescriptor(), -1);
             QCOMPARE(qvariant_cast<QLocalSocket::LocalSocketError>(spyError.first()[0]),