summaryrefslogtreecommitdiffstats
path: root/src/network/socket/qabstractsocket.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/network/socket/qabstractsocket.h')
-rw-r--r--src/network/socket/qabstractsocket.h10
1 files changed, 3 insertions, 7 deletions
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