Standardize override declaration

Update our overrides to Qt coding standard getting rid of
Q_DECL_OVERRIDE and redundant virtual declarations.

Change-Id: Id8b0750eb05c51fc8f50cac4000a811eebcbf918
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

5 files changed, 27 insertions, 26 deletions

diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h
index c373665ee..45ad2e872 100644
--- a/src/core/renderer/content_renderer_client_qt.h
+++ b/src/core/renderer/content_renderer_client_qt.h
@@ -42,7 +42,6 @@
 #include "content/public/renderer/content_renderer_client.h"
 #include "components/spellcheck/spellcheck_build_features.h"
 
-#include <QtGlobal>
 #include <QScopedPointer>
 
 namespace visitedlink {
@@ -63,20 +62,20 @@ class ContentRendererClientQt : public content::ContentRendererClient {
 public:
     ContentRendererClientQt();
     ~ContentRendererClientQt();
-    virtual void RenderThreadStarted() Q_DECL_OVERRIDE;
-    virtual void RenderViewCreated(content::RenderView *render_view) Q_DECL_OVERRIDE;
-    virtual void RenderFrameCreated(content::RenderFrame* render_frame) Q_DECL_OVERRIDE;
-    virtual bool ShouldSuppressErrorPage(content::RenderFrame *, const GURL &) Q_DECL_OVERRIDE;
-    virtual bool HasErrorPage(int httpStatusCode, std::string *errorDomain) Q_DECL_OVERRIDE;
-    virtual void GetNavigationErrorStrings(content::RenderFrame* renderFrame, const blink::WebURLRequest& failedRequest
-            , const blink::WebURLError& error, std::string* errorHtml, base::string16* errorDescription) Q_DECL_OVERRIDE;
+    void RenderThreadStarted() override;
+    void RenderViewCreated(content::RenderView *render_view) override;
+    void RenderFrameCreated(content::RenderFrame* render_frame) override;
+    bool ShouldSuppressErrorPage(content::RenderFrame *, const GURL &) override;
+    bool HasErrorPage(int httpStatusCode, std::string *errorDomain) override;
+    void GetNavigationErrorStrings(content::RenderFrame* renderFrame, const blink::WebURLRequest& failedRequest,
+                                   const blink::WebURLError& error, std::string* errorHtml, base::string16* errorDescription) override;
 
-    virtual unsigned long long VisitedLinkHash(const char *canonicalUrl, size_t length) Q_DECL_OVERRIDE;
-    virtual bool IsLinkVisited(unsigned long long linkHash) Q_DECL_OVERRIDE;
-    virtual void AddSupportedKeySystems(std::vector<std::unique_ptr<media::KeySystemProperties>>* key_systems) Q_DECL_OVERRIDE;
+    unsigned long long VisitedLinkHash(const char *canonicalUrl, size_t length) override;
+    bool IsLinkVisited(unsigned long long linkHash) override;
+    void AddSupportedKeySystems(std::vector<std::unique_ptr<media::KeySystemProperties>>* key_systems) override;
 
-    virtual void RunScriptsAtDocumentStart(content::RenderFrame* render_frame) Q_DECL_OVERRIDE;
-    virtual void RunScriptsAtDocumentEnd(content::RenderFrame* render_frame) Q_DECL_OVERRIDE;
+    void RunScriptsAtDocumentStart(content::RenderFrame* render_frame) override;
+    void RunScriptsAtDocumentEnd(content::RenderFrame* render_frame) override;
 
 private:
     QScopedPointer<visitedlink::VisitedLinkSlave> m_visitedLinkSlave;
diff --git a/src/core/renderer/render_view_observer_qt.h b/src/core/renderer/render_view_observer_qt.h
index 538ebea8a..60b11c428 100644
--- a/src/core/renderer/render_view_observer_qt.h
+++ b/src/core/renderer/render_view_observer_qt.h
@@ -57,10 +57,10 @@ private:
     void onFetchDocumentInnerText(quint64 requestId);
     void onSetBackgroundColor(quint32 color);
 
-    void OnDestruct() Q_DECL_OVERRIDE { }
+    void OnDestruct() override { }
 
-    virtual bool OnMessageReceived(const IPC::Message& message) Q_DECL_OVERRIDE;
-    virtual void Navigate(const GURL& url) Q_DECL_OVERRIDE;
+    bool OnMessageReceived(const IPC::Message& message) override;
+    void Navigate(const GURL& url) override;
 
     web_cache::WebCacheImpl* m_web_cache_impl;
 
diff --git a/src/core/renderer/user_resource_controller.cpp b/src/core/renderer/user_resource_controller.cpp
index c89ad69ad..b172c762b 100644
--- a/src/core/renderer/user_resource_controller.cpp
+++ b/src/core/renderer/user_resource_controller.cpp
@@ -103,12 +103,12 @@ public:
     RenderViewObserverHelper(content::RenderView *);
 private:
     // RenderViewObserver implementation.
-    virtual void DidFinishDocumentLoad(blink::WebLocalFrame* frame) Q_DECL_OVERRIDE;
-    virtual void DidFinishLoad(blink::WebLocalFrame* frame) Q_DECL_OVERRIDE;
-    virtual void DidStartProvisionalLoad(blink::WebLocalFrame* frame) Q_DECL_OVERRIDE;
-    virtual void FrameDetached(blink::WebFrame* frame) Q_DECL_OVERRIDE;
-    virtual void OnDestruct() Q_DECL_OVERRIDE;
-    virtual bool OnMessageReceived(const IPC::Message& message) Q_DECL_OVERRIDE;
+    void DidFinishDocumentLoad(blink::WebLocalFrame* frame) override;
+    void DidFinishLoad(blink::WebLocalFrame* frame) override;
+    void DidStartProvisionalLoad(blink::WebLocalFrame* frame) override;
+    void FrameDetached(blink::WebFrame* frame) override;
+    void OnDestruct() override;
+    bool OnMessageReceived(const IPC::Message& message) override;
 
     void onUserScriptAdded(const UserScriptData &);
     void onUserScriptRemoved(const UserScriptData &);
diff --git a/src/core/renderer/user_resource_controller.h b/src/core/renderer/user_resource_controller.h
index d0b5088d6..5d412fe40 100644
--- a/src/core/renderer/user_resource_controller.h
+++ b/src/core/renderer/user_resource_controller.h
@@ -44,7 +44,6 @@
 
 #include "common/user_script_data.h"
 
-#include <QtCore/qcompilerdetection.h>
 #include <QtCore/QHash>
 #include <QtCore/QSet>
 
diff --git a/src/core/renderer/web_channel_ipc_transport.h b/src/core/renderer/web_channel_ipc_transport.h
index e949d1c99..a2c7d5b4e 100644
--- a/src/core/renderer/web_channel_ipc_transport.h
+++ b/src/core/renderer/web_channel_ipc_transport.h
@@ -43,7 +43,8 @@
 #include "base/values.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "content/public/renderer/render_view_observer_tracker.h"
-#include <QtCore/qcompilerdetection.h>
+
+#include <QtCore/qglobal.h>
 
 namespace content {
 class RenderFrame;
@@ -67,8 +68,10 @@ private:
     void dispatchWebChannelMessage(const std::vector<char> &binaryJSON, uint worldId);
     void installWebChannel(uint worldId);
     void uninstallWebChannel(uint worldId);
-    virtual bool OnMessageReceived(const IPC::Message &message) Q_DECL_OVERRIDE;
-    virtual void OnDestruct() Q_DECL_OVERRIDE { }
+
+    // content::RenderViewObserver overrides:
+    bool OnMessageReceived(const IPC::Message &message) override;
+    void OnDestruct() override { }
 
     bool m_installed;
     uint m_installedWorldId;