Replace Q_DECL_OVERRIDE with override

Change-Id: I3ebce12c9b14cd413f06eb36b836b1e10adbbed6
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

8 files changed, 137 insertions, 137 deletions

diff --git a/src/plugins/android/qandroidwebview_p.h b/src/plugins/android/qandroidwebview_p.h
index 1498a98..bdbf1be 100644
--- a/src/plugins/android/qandroidwebview_p.h
+++ b/src/plugins/android/qandroidwebview_p.h
@@ -62,34 +62,34 @@ class QAndroidWebViewPrivate : public QAbstractWebView
     Q_OBJECT
 public:
     explicit QAndroidWebViewPrivate(QObject *p = 0);
-    ~QAndroidWebViewPrivate() Q_DECL_OVERRIDE;
+    ~QAndroidWebViewPrivate() override;
 
-    QString httpUserAgent() const Q_DECL_OVERRIDE;
-    void setHttpUserAgent(const QString &httpUserAgent) Q_DECL_OVERRIDE;
-    QUrl url() const Q_DECL_OVERRIDE;
-    void setUrl(const QUrl &url) Q_DECL_OVERRIDE;
-    bool canGoBack() const Q_DECL_OVERRIDE;
-    bool canGoForward() const Q_DECL_OVERRIDE;
-    QString title() const Q_DECL_OVERRIDE;
-    int loadProgress() const Q_DECL_OVERRIDE;
-    bool isLoading() const Q_DECL_OVERRIDE;
+    QString httpUserAgent() const override;
+    void setHttpUserAgent(const QString &httpUserAgent) override;
+    QUrl url() const override;
+    void setUrl(const QUrl &url) override;
+    bool canGoBack() const override;
+    bool canGoForward() const override;
+    QString title() const override;
+    int loadProgress() const override;
+    bool isLoading() const override;
 
-    void setParentView(QObject *view) Q_DECL_OVERRIDE;
-    QObject *parentView() const Q_DECL_OVERRIDE;
-    void setGeometry(const QRect &geometry) Q_DECL_OVERRIDE;
-    void setVisibility(QWindow::Visibility visibility) Q_DECL_OVERRIDE;
-    void setVisible(bool visible) Q_DECL_OVERRIDE;
+    void setParentView(QObject *view) override;
+    QObject *parentView() const override;
+    void setGeometry(const QRect &geometry) override;
+    void setVisibility(QWindow::Visibility visibility) override;
+    void setVisible(bool visible) override;
 
 public Q_SLOTS:
-    void goBack() Q_DECL_OVERRIDE;
-    void goForward() Q_DECL_OVERRIDE;
-    void reload() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
-    void loadHtml(const QString &html, const QUrl &baseUrl = QUrl()) Q_DECL_OVERRIDE;
+    void goBack() override;
+    void goForward() override;
+    void reload() override;
+    void stop() override;
+    void loadHtml(const QString &html, const QUrl &baseUrl = QUrl()) override;
 
 protected:
     void runJavaScriptPrivate(const QString& script,
-                              int callbackId) Q_DECL_OVERRIDE;
+                              int callbackId) override;
 
 private Q_SLOTS:
     void onApplicationStateChanged(Qt::ApplicationState state);
diff --git a/src/plugins/darwin/qdarwinwebview_p.h b/src/plugins/darwin/qdarwinwebview_p.h
index c69ee55..b303702 100644
--- a/src/plugins/darwin/qdarwinwebview_p.h
+++ b/src/plugins/darwin/qdarwinwebview_p.h
@@ -80,35 +80,35 @@ class QDarwinWebViewPrivate : public QAbstractWebView
     Q_OBJECT
 public:
     explicit QDarwinWebViewPrivate(QObject *p = 0);
-    ~QDarwinWebViewPrivate() Q_DECL_OVERRIDE;
-
-    QString httpUserAgent() const Q_DECL_OVERRIDE;
-    void setHttpUserAgent(const QString &httpUserAgent) Q_DECL_OVERRIDE;
-    QUrl url() const Q_DECL_OVERRIDE;
-    void setUrl(const QUrl &url) Q_DECL_OVERRIDE;
-    bool canGoBack() const Q_DECL_OVERRIDE;
-    bool canGoForward() const Q_DECL_OVERRIDE;
-    QString title() const Q_DECL_OVERRIDE;
-    int loadProgress() const Q_DECL_OVERRIDE;
-    bool isLoading() const Q_DECL_OVERRIDE;
-
-    void setParentView(QObject *view) Q_DECL_OVERRIDE;
-    QObject *parentView() const Q_DECL_OVERRIDE;
-    void setGeometry(const QRect &geometry) Q_DECL_OVERRIDE;
-    void setVisibility(QWindow::Visibility visibility) Q_DECL_OVERRIDE;
-    void setVisible(bool visible) Q_DECL_OVERRIDE;
-    void setFocus(bool focus) Q_DECL_OVERRIDE;
+    ~QDarwinWebViewPrivate() override;
+
+    QString httpUserAgent() const override;
+    void setHttpUserAgent(const QString &httpUserAgent) override;
+    QUrl url() const override;
+    void setUrl(const QUrl &url) override;
+    bool canGoBack() const override;
+    bool canGoForward() const override;
+    QString title() const override;
+    int loadProgress() const override;
+    bool isLoading() const override;
+
+    void setParentView(QObject *view) override;
+    QObject *parentView() const override;
+    void setGeometry(const QRect &geometry) override;
+    void setVisibility(QWindow::Visibility visibility) override;
+    void setVisible(bool visible) override;
+    void setFocus(bool focus) override;
 
 public Q_SLOTS:
-    void goBack() Q_DECL_OVERRIDE;
-    void goForward() Q_DECL_OVERRIDE;
-    void reload() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
-    void loadHtml(const QString &html, const QUrl &baseUrl = QUrl()) Q_DECL_OVERRIDE;
+    void goBack() override;
+    void goForward() override;
+    void reload() override;
+    void stop() override;
+    void loadHtml(const QString &html, const QUrl &baseUrl = QUrl()) override;
 
 protected:
     void runJavaScriptPrivate(const QString& script,
-                              int callbackId) Q_DECL_OVERRIDE;
+                              int callbackId) override;
 
 public:
     WKWebView *wkWebView;
diff --git a/src/plugins/webengine/qwebenginewebview_p.h b/src/plugins/webengine/qwebenginewebview_p.h
index 995f2f0..aee29f0 100644
--- a/src/plugins/webengine/qwebenginewebview_p.h
+++ b/src/plugins/webengine/qwebenginewebview_p.h
@@ -68,31 +68,31 @@ class QWebEngineWebViewPrivate : public QAbstractWebView
     Q_OBJECT
 public:
     explicit QWebEngineWebViewPrivate(QObject *p = 0);
-    ~QWebEngineWebViewPrivate() Q_DECL_OVERRIDE;
-
-    QString httpUserAgent() const Q_DECL_OVERRIDE;
-    void setHttpUserAgent(const QString &userAgent) Q_DECL_OVERRIDE;
-    QUrl url() const Q_DECL_OVERRIDE;
-    void setUrl(const QUrl &url) Q_DECL_OVERRIDE;
-    bool canGoBack() const Q_DECL_OVERRIDE;
-    bool canGoForward() const Q_DECL_OVERRIDE;
-    QString title() const Q_DECL_OVERRIDE;
-    int loadProgress() const Q_DECL_OVERRIDE;
-    bool isLoading() const Q_DECL_OVERRIDE;
-
-    void setParentView(QObject *parentView) Q_DECL_OVERRIDE;
-    QObject *parentView() const Q_DECL_OVERRIDE;
-    void setGeometry(const QRect &geometry) Q_DECL_OVERRIDE;
-    void setVisibility(QWindow::Visibility visibility) Q_DECL_OVERRIDE;
-    void setVisible(bool visible) Q_DECL_OVERRIDE;
-    void setFocus(bool focus) Q_DECL_OVERRIDE;
+    ~QWebEngineWebViewPrivate() override;
+
+    QString httpUserAgent() const override;
+    void setHttpUserAgent(const QString &userAgent) override;
+    QUrl url() const override;
+    void setUrl(const QUrl &url) override;
+    bool canGoBack() const override;
+    bool canGoForward() const override;
+    QString title() const override;
+    int loadProgress() const override;
+    bool isLoading() const override;
+
+    void setParentView(QObject *parentView) override;
+    QObject *parentView() const override;
+    void setGeometry(const QRect &geometry) override;
+    void setVisibility(QWindow::Visibility visibility) override;
+    void setVisible(bool visible) override;
+    void setFocus(bool focus) override;
 
 public Q_SLOTS:
-    void goBack() Q_DECL_OVERRIDE;
-    void goForward() Q_DECL_OVERRIDE;
-    void reload() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
-    void loadHtml(const QString &html, const QUrl &baseUrl = QUrl()) Q_DECL_OVERRIDE;
+    void goBack() override;
+    void goForward() override;
+    void reload() override;
+    void stop() override;
+    void loadHtml(const QString &html, const QUrl &baseUrl = QUrl()) override;
 
 private Q_SLOTS:
     void q_urlChanged();
@@ -104,7 +104,7 @@ private Q_SLOTS:
 
 protected:
     void runJavaScriptPrivate(const QString& script,
-                              int callbackId) Q_DECL_OVERRIDE;
+                              int callbackId) override;
 
 private:
     QQuickWebEngineProfile *m_profile;
diff --git a/src/plugins/winrt/qwinrtwebview_p.h b/src/plugins/winrt/qwinrtwebview_p.h
index 0030824..acd4c83 100644
--- a/src/plugins/winrt/qwinrtwebview_p.h
+++ b/src/plugins/winrt/qwinrtwebview_p.h
@@ -73,33 +73,33 @@ class QWinRTWebViewPrivate : public QAbstractWebView
     Q_OBJECT
 public:
     explicit QWinRTWebViewPrivate(QObject *parent = nullptr);
-    ~QWinRTWebViewPrivate() Q_DECL_OVERRIDE;
+    ~QWinRTWebViewPrivate() override;
 
-    QString httpUserAgent() const Q_DECL_OVERRIDE;
-    void setHttpUserAgent(const QString &userAgent) Q_DECL_OVERRIDE;
-    QUrl url() const Q_DECL_OVERRIDE;
-    void setUrl(const QUrl &url) Q_DECL_OVERRIDE;
-    bool canGoBack() const Q_DECL_OVERRIDE;
-    bool canGoForward() const Q_DECL_OVERRIDE;
-    QString title() const Q_DECL_OVERRIDE;
-    int loadProgress() const Q_DECL_OVERRIDE;
-    bool isLoading() const Q_DECL_OVERRIDE;
+    QString httpUserAgent() const override;
+    void setHttpUserAgent(const QString &userAgent) override;
+    QUrl url() const override;
+    void setUrl(const QUrl &url) override;
+    bool canGoBack() const override;
+    bool canGoForward() const override;
+    QString title() const override;
+    int loadProgress() const override;
+    bool isLoading() const override;
 
-    void setParentView(QObject *view) Q_DECL_OVERRIDE;
-    QObject *parentView() const Q_DECL_OVERRIDE;
-    void setGeometry(const QRect &geometry) Q_DECL_OVERRIDE;
-    void setVisibility(QWindow::Visibility visibility) Q_DECL_OVERRIDE;
-    void setVisible(bool visible) Q_DECL_OVERRIDE;
+    void setParentView(QObject *view) override;
+    QObject *parentView() const override;
+    void setGeometry(const QRect &geometry) override;
+    void setVisibility(QWindow::Visibility visibility) override;
+    void setVisible(bool visible) override;
 
 public Q_SLOTS:
-    void goBack() Q_DECL_OVERRIDE;
-    void goForward() Q_DECL_OVERRIDE;
-    void reload() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
-    void loadHtml(const QString &html, const QUrl &baseUrl = QUrl()) Q_DECL_OVERRIDE;
+    void goBack() override;
+    void goForward() override;
+    void reload() override;
+    void stop() override;
+    void loadHtml(const QString &html, const QUrl &baseUrl = QUrl()) override;
 
 protected:
-    void runJavaScriptPrivate(const QString &script, int callbackId) Q_DECL_OVERRIDE;
+    void runJavaScriptPrivate(const QString &script, int callbackId) override;
 
 private:
     HRESULT onNavigationStarted(ABI::Windows::UI::Xaml::Controls::IWebView *, ABI::Windows::UI::Xaml::Controls::IWebViewNavigationStartingEventArgs *);
diff --git a/src/webview/qquickviewcontroller.cpp b/src/webview/qquickviewcontroller.cpp
index 775dceb..75a64e0 100644
--- a/src/webview/qquickviewcontroller.cpp
+++ b/src/webview/qquickviewcontroller.cpp
@@ -58,9 +58,9 @@ public:
 
     inline void itemGeometryChanged(QQuickItem *,
                                     QQuickGeometryChange,
-                                    const QRectF &) Q_DECL_OVERRIDE;
-    void itemChildRemoved(QQuickItem *item, QQuickItem *child) Q_DECL_OVERRIDE;
-    void itemParentChanged(QQuickItem *item, QQuickItem *parent) Q_DECL_OVERRIDE;
+                                    const QRectF &) override;
+    void itemChildRemoved(QQuickItem *item, QQuickItem *child) override;
+    void itemParentChanged(QQuickItem *item, QQuickItem *parent) override;
 
 private:
     Q_DISABLE_COPY(QQuickViewChangeListener)
diff --git a/src/webview/qquickviewcontroller_p.h b/src/webview/qquickviewcontroller_p.h
index 6bf7311..060b7bc 100644
--- a/src/webview/qquickviewcontroller_p.h
+++ b/src/webview/qquickviewcontroller_p.h
@@ -70,9 +70,9 @@ public Q_SLOTS:
     void onVisibleChanged();
 
 protected:
-    void componentComplete() Q_DECL_OVERRIDE;
-    void updatePolish() Q_DECL_OVERRIDE;
-    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
+    void componentComplete() override;
+    void updatePolish() override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
     void setView(QNativeViewController *view);
 
 private:
diff --git a/src/webview/qquickwebview_p.h b/src/webview/qquickwebview_p.h
index fef5af9..b7f8fb2 100644
--- a/src/webview/qquickwebview_p.h
+++ b/src/webview/qquickwebview_p.h
@@ -80,22 +80,22 @@ public:
     QQuickWebView(QQuickItem *parent = 0);
     ~QQuickWebView();
 
-    QString httpUserAgent() const Q_DECL_OVERRIDE;
-    void setHttpUserAgent(const QString &userAgent) Q_DECL_OVERRIDE;
-    QUrl url() const Q_DECL_OVERRIDE;
-    void setUrl(const QUrl &url) Q_DECL_OVERRIDE;
-    int loadProgress() const Q_DECL_OVERRIDE;
-    QString title() const Q_DECL_OVERRIDE;
-    bool canGoBack() const Q_DECL_OVERRIDE;
-    bool isLoading() const Q_DECL_OVERRIDE;
-    bool canGoForward() const Q_DECL_OVERRIDE;
+    QString httpUserAgent() const override;
+    void setHttpUserAgent(const QString &userAgent) override;
+    QUrl url() const override;
+    void setUrl(const QUrl &url) override;
+    int loadProgress() const override;
+    QString title() const override;
+    bool canGoBack() const override;
+    bool isLoading() const override;
+    bool canGoForward() const override;
 
 public Q_SLOTS:
-    void goBack() Q_DECL_OVERRIDE;
-    void goForward() Q_DECL_OVERRIDE;
-    void reload() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
-    Q_REVISION(1) void loadHtml(const QString &html, const QUrl &baseUrl = QUrl()) Q_DECL_OVERRIDE;
+    void goBack() override;
+    void goForward() override;
+    void reload() override;
+    void stop() override;
+    Q_REVISION(1) void loadHtml(const QString &html, const QUrl &baseUrl = QUrl()) override;
     Q_REVISION(1) void runJavaScript(const QString& script,
                                      const QJSValue &callback = QJSValue());
 
@@ -107,9 +107,9 @@ Q_SIGNALS:
     Q_REVISION(14) void httpUserAgentChanged();
 
 protected:
-    void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE;
+    void itemChange(ItemChange change, const ItemChangeData &value) override;
     void runJavaScriptPrivate(const QString& script,
-                              int callbackId) Q_DECL_OVERRIDE;
+                              int callbackId) override;
 
 private Q_SLOTS:
     void onRunJavaScriptResult(int id, const QVariant &variant);
diff --git a/src/webview/qwebview_p.h b/src/webview/qwebview_p.h
index a8c1bb0..a7f77aa 100644
--- a/src/webview/qwebview_p.h
+++ b/src/webview/qwebview_p.h
@@ -76,31 +76,31 @@ public:
     };
 
     explicit QWebView(QObject *p = 0);
-    ~QWebView() Q_DECL_OVERRIDE;
-
-    QString httpUserAgent() const Q_DECL_OVERRIDE;
-    void setHttpUserAgent(const QString &httpUserAgent) Q_DECL_OVERRIDE;
-    QUrl url() const Q_DECL_OVERRIDE;
-    void setUrl(const QUrl &url) Q_DECL_OVERRIDE;
-    bool canGoBack() const Q_DECL_OVERRIDE;
-    bool canGoForward() const Q_DECL_OVERRIDE;
-    QString title() const Q_DECL_OVERRIDE;
-    int loadProgress() const Q_DECL_OVERRIDE;
-    bool isLoading() const Q_DECL_OVERRIDE;
-
-    void setParentView(QObject *view) Q_DECL_OVERRIDE;
-    QObject *parentView() const Q_DECL_OVERRIDE;
-    void setGeometry(const QRect &geometry) Q_DECL_OVERRIDE;
-    void setVisibility(QWindow::Visibility visibility) Q_DECL_OVERRIDE;
-    void setVisible(bool visible) Q_DECL_OVERRIDE;
-    void setFocus(bool focus) Q_DECL_OVERRIDE;
+    ~QWebView() override;
+
+    QString httpUserAgent() const override;
+    void setHttpUserAgent(const QString &httpUserAgent) override;
+    QUrl url() const override;
+    void setUrl(const QUrl &url) override;
+    bool canGoBack() const override;
+    bool canGoForward() const override;
+    QString title() const override;
+    int loadProgress() const override;
+    bool isLoading() const override;
+
+    void setParentView(QObject *view) override;
+    QObject *parentView() const override;
+    void setGeometry(const QRect &geometry) override;
+    void setVisibility(QWindow::Visibility visibility) override;
+    void setVisible(bool visible) override;
+    void setFocus(bool focus) override;
 
 public Q_SLOTS:
-    void goBack() Q_DECL_OVERRIDE;
-    void goForward() Q_DECL_OVERRIDE;
-    void reload() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
-    void loadHtml(const QString &html, const QUrl &baseUrl = QUrl()) Q_DECL_OVERRIDE;
+    void goBack() override;
+    void goForward() override;
+    void reload() override;
+    void stop() override;
+    void loadHtml(const QString &html, const QUrl &baseUrl = QUrl()) override;
 
 Q_SIGNALS:
     void titleChanged();
@@ -112,9 +112,9 @@ Q_SIGNALS:
     void httpUserAgentChanged();
 
 protected:
-    void init() Q_DECL_OVERRIDE;
+    void init() override;
     void runJavaScriptPrivate(const QString &script,
-                              int callbackId) Q_DECL_OVERRIDE;
+                              int callbackId) override;
 
 private Q_SLOTS:
     void onTitleChanged(const QString &title);