From 6c58fa8980a2c783d9eca34aa482b74ac60a940a Mon Sep 17 00:00:00 2001 From: Jesus Fernandez Date: Fri, 10 Aug 2018 09:31:56 +0200 Subject: Use override keyword MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I120dcb26eb451930d02e452cc47262eda44cc77c Reviewed-by: Mårten Nordheim --- src/imports/qmlwebsockets/qqmlwebsocket.h | 6 +++--- src/imports/qmlwebsockets/qqmlwebsocketserver.h | 6 +++--- src/websockets/qdefaultmaskgenerator_p.h | 6 +++--- src/websockets/qmaskgenerator.h | 2 +- src/websockets/qsslserver_p.h | 4 ++-- src/websockets/qwebsocket.h | 2 +- src/websockets/qwebsocket_p.h | 2 +- src/websockets/qwebsocketdataprocessor_p.h | 2 +- src/websockets/qwebsockethandshakeresponse_p.h | 2 +- src/websockets/qwebsocketserver.h | 2 +- src/websockets/qwebsocketserver_p.h | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.h b/src/imports/qmlwebsockets/qqmlwebsocket.h index 8db435d..e1ffc72 100644 --- a/src/imports/qmlwebsockets/qqmlwebsocket.h +++ b/src/imports/qmlwebsockets/qqmlwebsocket.h @@ -62,7 +62,7 @@ class QQmlWebSocket : public QObject, public QQmlParserStatus public: explicit QQmlWebSocket(QObject *parent = 0); explicit QQmlWebSocket(QWebSocket *socket, QObject *parent = 0); - virtual ~QQmlWebSocket(); + ~QQmlWebSocket() override; enum Status { @@ -94,8 +94,8 @@ Q_SIGNALS: void urlChanged(); public: - void classBegin() Q_DECL_OVERRIDE; - void componentComplete() Q_DECL_OVERRIDE; + void classBegin() override; + void componentComplete() override; private Q_SLOTS: void onError(QAbstractSocket::SocketError error); diff --git a/src/imports/qmlwebsockets/qqmlwebsocketserver.h b/src/imports/qmlwebsockets/qqmlwebsocketserver.h index 5de5b09..98dbfc4 100644 --- a/src/imports/qmlwebsockets/qqmlwebsocketserver.h +++ b/src/imports/qmlwebsockets/qqmlwebsocketserver.h @@ -63,10 +63,10 @@ class QQmlWebSocketServer : public QObject, public QQmlParserStatus public: explicit QQmlWebSocketServer(QObject *parent = Q_NULLPTR); - virtual ~QQmlWebSocketServer(); + ~QQmlWebSocketServer() override; - void classBegin() Q_DECL_OVERRIDE; - void componentComplete() Q_DECL_OVERRIDE; + void classBegin() override; + void componentComplete() override; QUrl url() const; diff --git a/src/websockets/qdefaultmaskgenerator_p.h b/src/websockets/qdefaultmaskgenerator_p.h index 8637ec6..19387ad 100644 --- a/src/websockets/qdefaultmaskgenerator_p.h +++ b/src/websockets/qdefaultmaskgenerator_p.h @@ -62,10 +62,10 @@ class Q_AUTOTEST_EXPORT QDefaultMaskGenerator : public QMaskGenerator public: explicit QDefaultMaskGenerator(QObject *parent = 0); - virtual ~QDefaultMaskGenerator(); + ~QDefaultMaskGenerator() override; - bool seed() Q_DECL_NOEXCEPT Q_DECL_OVERRIDE; - quint32 nextMask() Q_DECL_NOEXCEPT Q_DECL_OVERRIDE; + bool seed() Q_DECL_NOEXCEPT override; + quint32 nextMask() Q_DECL_NOEXCEPT override; }; QT_END_NAMESPACE diff --git a/src/websockets/qmaskgenerator.h b/src/websockets/qmaskgenerator.h index 5cd8144..419daca 100644 --- a/src/websockets/qmaskgenerator.h +++ b/src/websockets/qmaskgenerator.h @@ -51,7 +51,7 @@ class Q_WEBSOCKETS_EXPORT QMaskGenerator : public QObject public: explicit QMaskGenerator(QObject *parent = nullptr); - virtual ~QMaskGenerator(); + ~QMaskGenerator() override; virtual bool seed() = 0; virtual quint32 nextMask() = 0; diff --git a/src/websockets/qsslserver_p.h b/src/websockets/qsslserver_p.h index 4cd0eac..10f8fea 100644 --- a/src/websockets/qsslserver_p.h +++ b/src/websockets/qsslserver_p.h @@ -66,7 +66,7 @@ class QSslServer : public QTcpServer public: explicit QSslServer(QObject *parent = nullptr); - virtual ~QSslServer(); + ~QSslServer() override; void setSslConfiguration(const QSslConfiguration &sslConfiguration); QSslConfiguration sslConfiguration() const; @@ -78,7 +78,7 @@ Q_SIGNALS: void preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *authenticator); protected: - virtual void incomingConnection(qintptr socket); + void incomingConnection(qintptr socket) override; private: QSslConfiguration m_sslConfiguration; diff --git a/src/websockets/qwebsocket.h b/src/websockets/qwebsocket.h index b8742e8..4944689 100644 --- a/src/websockets/qwebsocket.h +++ b/src/websockets/qwebsocket.h @@ -69,7 +69,7 @@ public: explicit QWebSocket(const QString &origin = QString(), QWebSocketProtocol::Version version = QWebSocketProtocol::VersionLatest, QObject *parent = nullptr); - virtual ~QWebSocket(); + ~QWebSocket() override; void abort(); QAbstractSocket::SocketError error() const; diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h index fd46e0a..91f8ad2 100644 --- a/src/websockets/qwebsocket_p.h +++ b/src/websockets/qwebsocket_p.h @@ -104,7 +104,7 @@ public: explicit QWebSocketPrivate(const QString &origin, QWebSocketProtocol::Version version, QWebSocket * const pWebSocket); - virtual ~QWebSocketPrivate(); + ~QWebSocketPrivate() override; void init(); void abort(); diff --git a/src/websockets/qwebsocketdataprocessor_p.h b/src/websockets/qwebsocketdataprocessor_p.h index 79881f8..e80a843 100644 --- a/src/websockets/qwebsocketdataprocessor_p.h +++ b/src/websockets/qwebsocketdataprocessor_p.h @@ -70,7 +70,7 @@ class Q_AUTOTEST_EXPORT QWebSocketDataProcessor : public QObject public: explicit QWebSocketDataProcessor(QObject *parent = nullptr); - virtual ~QWebSocketDataProcessor(); + ~QWebSocketDataProcessor() override; static quint64 maxMessageSize(); static quint64 maxFrameSize(); diff --git a/src/websockets/qwebsockethandshakeresponse_p.h b/src/websockets/qwebsockethandshakeresponse_p.h index 2c2c0b1..9a9b883 100644 --- a/src/websockets/qwebsockethandshakeresponse_p.h +++ b/src/websockets/qwebsockethandshakeresponse_p.h @@ -73,7 +73,7 @@ public: const QList &supportedProtocols, const QList &supportedExtensions); - virtual ~QWebSocketHandshakeResponse(); + ~QWebSocketHandshakeResponse() override; bool isValid() const; bool canUpgrade() const; diff --git a/src/websockets/qwebsocketserver.h b/src/websockets/qwebsocketserver.h index decd7c3..890f2d6 100644 --- a/src/websockets/qwebsocketserver.h +++ b/src/websockets/qwebsocketserver.h @@ -76,7 +76,7 @@ public: explicit QWebSocketServer(const QString &serverName, SslMode secureMode, QObject *parent = nullptr); - virtual ~QWebSocketServer(); + ~QWebSocketServer() override; bool listen(const QHostAddress &address = QHostAddress::Any, quint16 port = 0); void close(); diff --git a/src/websockets/qwebsocketserver_p.h b/src/websockets/qwebsocketserver_p.h index 0ca7495..b34bb72 100644 --- a/src/websockets/qwebsocketserver_p.h +++ b/src/websockets/qwebsocketserver_p.h @@ -82,7 +82,7 @@ public: explicit QWebSocketServerPrivate(const QString &serverName, SslMode secureMode, QWebSocketServer * const pWebSocketServer); - virtual ~QWebSocketServerPrivate(); + ~QWebSocketServerPrivate() override; void init(); void close(bool aboutToDestroy = false); -- cgit v1.2.1