3 files changed, 5 insertions, 54 deletions
diff --git a/src/network/doc/snippets/code/src_network_socket_qabstractsocket.cpp b/src/network/doc/snippets/code/src_network_socket_qabstractsocket.cpp
index e19cb40666..e03d8ca7be 100644
--- a/src/network/doc/snippets/code/src_network_socket_qabstractsocket.cpp
+++ b/src/network/doc/snippets/code/src_network_socket_qabstractsocket.cpp
@@ -65,17 +65,5 @@ if (socket->state() == QAbstractSocket::UnconnectedState
 
 
 //! [2]
- // This slot is connected to QAbstractSocket::readyRead()
- void SocketClass::readyReadSlot()
- {
-     while (!socket.atEnd()) {
-         QByteArray data = socket.read(100);
-         ....
-     }
- }
-//! [2]
-
-
-//! [3]
 socket->setProxy(QNetworkProxy::NoProxy);
-//! [3]
+//! [2]
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 3bde2215ad..f3885a22fe 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -1865,22 +1865,6 @@ QString QAbstractSocket::peerName() const
 }
 
 /*!
-    Returns \c true if a line of data can be read from the socket;
-    otherwise returns \c false.
-
-    \sa readLine()
-*/
-bool QAbstractSocket::canReadLine() const
-{
-    bool hasLine = QIODevice::canReadLine();
-#if defined (QABSTRACTSOCKET_DEBUG)
-    qDebug("QAbstractSocket::canReadLine() == %s, buffer size = %lld, size = %lld",
-           hasLine ? "true" : "false", d_func()->buffer.size(), d_func()->buffer.size());
-#endif
-    return hasLine;
-}
-
-/*!
     Returns the native socket descriptor of the QAbstractSocket object
     if this is available; otherwise returns -1.
 
@@ -2413,23 +2397,6 @@ bool QAbstractSocket::isSequential() const
     return true;
 }
 
-/*! \reimp
-
-     Returns \c true if no more data is currently
-     available for reading; otherwise returns \c false.
-
-     This function is most commonly used when reading data from the
-     socket in a loop. For example:
-
-     \snippet code/src_network_socket_qabstractsocket.cpp 2
-
-     \sa bytesAvailable(), readyRead()
- */
-bool QAbstractSocket::atEnd() const
-{
-    return QIODevice::atEnd();
-}
-
 /*!
     This function writes as much as possible from the internal write buffer to
     the underlying network socket, without blocking. If any data was written,
@@ -2882,7 +2849,7 @@ void QAbstractSocket::setSocketError(SocketError socketError)
     To disable the use of a proxy for this socket, use the
     QNetworkProxy::NoProxy proxy type:
 
-    \snippet code/src_network_socket_qabstractsocket.cpp 3
+    \snippet code/src_network_socket_qabstractsocket.cpp 2
 
     The default value for the proxy is QNetworkProxy::DefaultProxy,
     which means the socket will use the application settings: if a
diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h
index 865f667d46..bf1ff7e9a2 100644
--- a/src/network/socket/qabstractsocket.h
+++ b/src/network/socket/qabstractsocket.h
@@ -146,13 +146,12 @@ public:
     PauseModes pauseMode() const;
     void setPauseMode(PauseModes pauseMode);
 
-    // ### Qt6: make the first one virtual
-    bool bind(const QHostAddress &address, quint16 port = 0, BindMode mode = DefaultForPlatform);
+    virtual bool bind(const QHostAddress &address, quint16 port = 0,
+                      BindMode mode = DefaultForPlatform);
     bool bind(quint16 port = 0, BindMode mode = DefaultForPlatform);
 
-    // ### Qt6: de-virtualize connectToHost(QHostAddress) overload
     virtual void connectToHost(const QString &hostName, quint16 port, OpenMode mode = ReadWrite, NetworkLayerProtocol protocol = AnyIPProtocol);
-    virtual void connectToHost(const QHostAddress &address, quint16 port, OpenMode mode = ReadWrite);
+    void connectToHost(const QHostAddress &address, quint16 port, OpenMode mode = ReadWrite);
     virtual void disconnectFromHost();
 
     bool isValid() const;
@@ -160,8 +159,6 @@ public:
     qint64 bytesAvailable() const override;
     qint64 bytesToWrite() const override;
 
-    bool canReadLine() const override; // ### Qt6: remove me
-
     quint16 localPort() const;
     QHostAddress localAddress() const;
     quint16 peerPort() const;
@@ -187,7 +184,6 @@ public:
     // from QIODevice
     void close() override;
     bool isSequential() const override;
-    bool atEnd() const override; // ### Qt6: remove me
     bool flush();
 
     // for synchronous access