Use override keyword

Change-Id: I120dcb26eb451930d02e452cc47262eda44cc77c
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

examples/websockets/simplechat/chatserver.h

@@ -62,7 +62,7 @@ class ChatServer : public QObject
     Q_OBJECT
 public:
     explicit ChatServer(quint16 port, QObject *parent = nullptr);
-    virtual ~ChatServer();
+    ~ChatServer() override;
 
 private slots:
     void onNewConnection();

examples/websockets/sslechoserver/sslechoserver.h

@@ -63,7 +63,7 @@ class SslEchoServer : public QObject
     Q_OBJECT
 public:
     explicit SslEchoServer(quint16 port, QObject *parent = nullptr);
-    virtual ~SslEchoServer();
+    ~SslEchoServer() override;
 
 private Q_SLOTS:
     void onNewConnection();

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);

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;
 

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

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;

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;

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;

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();

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();

src/websockets/qwebsockethandshakeresponse_p.h

@@ -73,7 +73,7 @@ public:
                       const QList<QString> &supportedProtocols,
                       const QList<QString> &supportedExtensions);
 
-    virtual ~QWebSocketHandshakeResponse();
+    ~QWebSocketHandshakeResponse() override;
 
     bool isValid() const;
     bool canUpgrade() const;

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();

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);