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>
This commit is contained in:
Alexander Akulich 2020-02-07 16:31:55 +03:00
parent 11dc7b35c8
commit c034f92fc2
7 changed files with 14 additions and 54 deletions

View File

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

View File

@ -97,12 +97,7 @@ public:
virtual bool canReadLine() const override; virtual bool canReadLine() const override;
virtual bool open(OpenMode openMode = ReadWrite) override; virtual bool open(OpenMode openMode = ReadWrite) override;
virtual void close() 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 flush();
bool isValid() const; bool isValid() const;
qint64 readBufferSize() const; qint64 readBufferSize() const;

View File

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

View File

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

View File

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

View File

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

View File

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