diff options
Diffstat (limited to 'src/network/ssl/qsslsocket.h')
-rw-r--r-- | src/network/ssl/qsslsocket.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h index 1b29cd4637..43b60e4f39 100644 --- a/src/network/ssl/qsslsocket.h +++ b/src/network/ssl/qsslsocket.h @@ -81,20 +81,20 @@ public: explicit QSslSocket(QObject *parent = Q_NULLPTR); ~QSslSocket(); - void resume() Q_DECL_OVERRIDE; // to continue after proxy authentication required, SSL errors etc. + void resume() override; // to continue after proxy authentication required, SSL errors etc. // Autostarting the SSL client handshake. void connectToHostEncrypted(const QString &hostName, quint16 port, OpenMode mode = ReadWrite, NetworkLayerProtocol protocol = AnyIPProtocol); void connectToHostEncrypted(const QString &hostName, quint16 port, const QString &sslPeerName, OpenMode mode = ReadWrite, NetworkLayerProtocol protocol = AnyIPProtocol); bool setSocketDescriptor(qintptr socketDescriptor, SocketState state = ConnectedState, - OpenMode openMode = ReadWrite) Q_DECL_OVERRIDE; + OpenMode openMode = ReadWrite) override; using QAbstractSocket::connectToHost; - void connectToHost(const QString &hostName, quint16 port, OpenMode openMode = ReadWrite, NetworkLayerProtocol protocol = AnyIPProtocol) Q_DECL_OVERRIDE; - void disconnectFromHost() Q_DECL_OVERRIDE; + void connectToHost(const QString &hostName, quint16 port, OpenMode openMode = ReadWrite, NetworkLayerProtocol protocol = AnyIPProtocol) override; + void disconnectFromHost() override; - virtual void setSocketOption(QAbstractSocket::SocketOption option, const QVariant &value) Q_DECL_OVERRIDE; - virtual QVariant socketOption(QAbstractSocket::SocketOption option) Q_DECL_OVERRIDE; + virtual void setSocketOption(QAbstractSocket::SocketOption option, const QVariant &value) override; + virtual QVariant socketOption(QAbstractSocket::SocketOption option) override; SslMode mode() const; bool isEncrypted() const; @@ -112,16 +112,16 @@ public: void setPeerVerifyName(const QString &hostName); // From QIODevice - qint64 bytesAvailable() const Q_DECL_OVERRIDE; - qint64 bytesToWrite() const Q_DECL_OVERRIDE; - bool canReadLine() const Q_DECL_OVERRIDE; - void close() Q_DECL_OVERRIDE; - bool atEnd() const Q_DECL_OVERRIDE; + qint64 bytesAvailable() const override; + qint64 bytesToWrite() const override; + bool canReadLine() const override; + void close() override; + bool atEnd() const override; bool flush(); // ### Qt6: remove me (implementation moved to private flush()) void abort(); // From QAbstractSocket: - void setReadBufferSize(qint64 size) Q_DECL_OVERRIDE; + void setReadBufferSize(qint64 size) override; // Similar to QIODevice's: qint64 encryptedBytesAvailable() const; @@ -179,11 +179,11 @@ public: QT_DEPRECATED_X("Use QSslConfiguration::systemCaCertificates()") static QList<QSslCertificate> systemCaCertificates(); #endif // QT_DEPRECATED_SINCE(5, 5) - bool waitForConnected(int msecs = 30000) Q_DECL_OVERRIDE; + bool waitForConnected(int msecs = 30000) override; bool waitForEncrypted(int msecs = 30000); - bool waitForReadyRead(int msecs = 30000) Q_DECL_OVERRIDE; - bool waitForBytesWritten(int msecs = 30000) Q_DECL_OVERRIDE; - bool waitForDisconnected(int msecs = 30000) Q_DECL_OVERRIDE; + bool waitForReadyRead(int msecs = 30000) override; + bool waitForBytesWritten(int msecs = 30000) override; + bool waitForDisconnected(int msecs = 30000) override; QList<QSslError> sslErrors() const; @@ -209,8 +209,8 @@ Q_SIGNALS: void preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *authenticator); protected: - qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE; + qint64 readData(char *data, qint64 maxlen) override; + qint64 writeData(const char *data, qint64 len) override; private: Q_DECLARE_PRIVATE(QSslSocket) |