Replace Q_DECL_OVERRIDE with override

Change-Id: I5fb337a83bfc98c23b2f3cd51839feb40fad010e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

5 files changed, 30 insertions, 30 deletions

diff --git a/src/core/clipboard_qt.h b/src/core/clipboard_qt.h
index 20b51a599..2089208bf 100644
--- a/src/core/clipboard_qt.h
+++ b/src/core/clipboard_qt.h
@@ -82,7 +82,7 @@ public:
     void ReadBookmark(base::string16* title, std::string* url) const override;
     void ReadData(const FormatType& format, std::string* result) const override;
 
-    virtual void OnPreShutdown() Q_DECL_OVERRIDE { }
+    void OnPreShutdown() override { }
 
 protected:
     void WriteObjects(ui::ClipboardType type, const ObjectMap& objects) override;
diff --git a/src/core/network_delegate_qt.h b/src/core/network_delegate_qt.h
index 590b3b20c..75d141ceb 100644
--- a/src/core/network_delegate_qt.h
+++ b/src/core/network_delegate_qt.h
@@ -73,29 +73,29 @@ public:
                                       const net::CompletionCallback &callback);
 
     // net::NetworkDelegate implementation
-    virtual int OnBeforeURLRequest(net::URLRequest* request, const net::CompletionCallback& callback, GURL* newUrl) override;
-    virtual void OnURLRequestDestroyed(net::URLRequest* request) override;
-    virtual bool OnCanSetCookie(const net::URLRequest&, const std::string&, net::CookieOptions*) override;
-    virtual int OnBeforeStartTransaction(net::URLRequest *request, const net::CompletionCallback &callback, net::HttpRequestHeaders *headers) override;
+    int OnBeforeURLRequest(net::URLRequest* request, const net::CompletionCallback& callback, GURL* newUrl) override;
+    void OnURLRequestDestroyed(net::URLRequest* request) override;
+    bool OnCanSetCookie(const net::URLRequest&, const std::string&, net::CookieOptions*) override;
+    int OnBeforeStartTransaction(net::URLRequest *request, const net::CompletionCallback &callback, net::HttpRequestHeaders *headers) override;
     virtual void OnBeforeSendHeaders(net::URLRequest* request, const net::ProxyInfo& proxy_info,
                                      const net::ProxyRetryInfoMap& proxy_retry_info, net::HttpRequestHeaders* headers) override;
-    virtual void OnStartTransaction(net::URLRequest *request, const net::HttpRequestHeaders &headers) override;
-    virtual int OnHeadersReceived(net::URLRequest*, const net::CompletionCallback&, const net::HttpResponseHeaders*, scoped_refptr<net::HttpResponseHeaders>*, GURL*) override;
-    virtual void OnBeforeRedirect(net::URLRequest*, const GURL&) override;
-    virtual void OnResponseStarted(net::URLRequest*) override;
-    virtual void OnNetworkBytesReceived(net::URLRequest*, int64_t) override;
-    virtual void OnNetworkBytesSent(net::URLRequest *, int64_t) override;
-    virtual void OnCompleted(net::URLRequest*, bool) override;
-    virtual void OnPACScriptError(int, const base::string16&) override;
-    virtual net::NetworkDelegate::AuthRequiredResponse OnAuthRequired(net::URLRequest*, const net::AuthChallengeInfo&, const AuthCallback&, net::AuthCredentials*) override;
-    virtual bool OnCanGetCookies(const net::URLRequest&, const net::CookieList&) override;
-    virtual bool OnCanAccessFile(const net::URLRequest& request, const base::FilePath& path) const override;
-    virtual bool OnCanEnablePrivacyMode(const GURL&, const GURL&) const override;
-    virtual bool OnAreExperimentalCookieFeaturesEnabled() const override;
-    virtual bool OnCancelURLRequestWithPolicyViolatingReferrerHeader(const net::URLRequest&, const GURL&, const GURL&) const override;
+    void OnStartTransaction(net::URLRequest *request, const net::HttpRequestHeaders &headers) override;
+    int OnHeadersReceived(net::URLRequest*, const net::CompletionCallback&, const net::HttpResponseHeaders*, scoped_refptr<net::HttpResponseHeaders>*, GURL*) override;
+    void OnBeforeRedirect(net::URLRequest*, const GURL&) override;
+    void OnResponseStarted(net::URLRequest*) override;
+    void OnNetworkBytesReceived(net::URLRequest*, int64_t) override;
+    void OnNetworkBytesSent(net::URLRequest *, int64_t) override;
+    void OnCompleted(net::URLRequest*, bool) override;
+    void OnPACScriptError(int, const base::string16&) override;
+    net::NetworkDelegate::AuthRequiredResponse OnAuthRequired(net::URLRequest*, const net::AuthChallengeInfo&, const AuthCallback&, net::AuthCredentials*) override;
+    bool OnCanGetCookies(const net::URLRequest&, const net::CookieList&) override;
+    bool OnCanAccessFile(const net::URLRequest& request, const base::FilePath& path) const override;
+    bool OnCanEnablePrivacyMode(const GURL&, const GURL&) const override;
+    bool OnAreExperimentalCookieFeaturesEnabled() const override;
+    bool OnCancelURLRequestWithPolicyViolatingReferrerHeader(const net::URLRequest&, const GURL&, const GURL&) const override;
 
-    virtual bool OnCanQueueReportingReport(const url::Origin& origin) const override;
-    virtual bool OnCanSendReportingReport(const url::Origin& origin) const override;
+    bool OnCanQueueReportingReport(const url::Origin& origin) const override;
+    bool OnCanSendReportingReport(const url::Origin& origin) const override;
     virtual bool OnCanSetReportingClient(const url::Origin& origin,
                                          const GURL& endpoint) const override;
     virtual bool OnCanUseReportingClient(const url::Origin& origin,
diff --git a/src/core/quota_permission_context_qt.h b/src/core/quota_permission_context_qt.h
index 68d768ac6..99e07eec7 100644
--- a/src/core/quota_permission_context_qt.h
+++ b/src/core/quota_permission_context_qt.h
@@ -42,7 +42,7 @@
 
 #include "content/public/browser/quota_permission_context.h"
 
-#include <QtCore/qcompilerdetection.h> // Needed for Q_DECL_OVERRIDE
+#include <QtCore/qcompilerdetection.h> // Needed for override
 
 namespace QtWebEngineCore {
 
@@ -50,7 +50,7 @@ class QuotaPermissionContextQt : public content::QuotaPermissionContext {
 public:
     void RequestQuotaPermission(const content::StorageQuotaParams &params,
                                 int render_process_id,
-                                const PermissionCallback &callback) Q_DECL_OVERRIDE;
+                                const PermissionCallback &callback) override;
 
     void dispatchCallbackOnIOThread(const PermissionCallback &callback,
                                     QuotaPermissionContext::QuotaPermissionResponse response);
diff --git a/src/core/renderer/web_channel_ipc_transport.cpp b/src/core/renderer/web_channel_ipc_transport.cpp
index cec8344b6..aaf831fb6 100644
--- a/src/core/renderer/web_channel_ipc_transport.cpp
+++ b/src/core/renderer/web_channel_ipc_transport.cpp
@@ -66,7 +66,7 @@ public:
 private:
     content::RenderView *GetRenderView(v8::Isolate *isolate);
     WebChannelTransport() { }
-    virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder(v8::Isolate *isolate) override;
+    gin::ObjectTemplateBuilder GetObjectTemplateBuilder(v8::Isolate *isolate) override;
 
     bool NativeQtSendMessage(gin::Arguments *args)
     {
diff --git a/src/core/ssl_host_state_delegate_qt.h b/src/core/ssl_host_state_delegate_qt.h
index 7cc63b339..6d05ea366 100644
--- a/src/core/ssl_host_state_delegate_qt.h
+++ b/src/core/ssl_host_state_delegate_qt.h
@@ -61,14 +61,14 @@ public:
     ~SSLHostStateDelegateQt();
 
     // content::SSLHostStateDelegate implementation:
-    virtual void AllowCert(const std::string &, const net::X509Certificate &cert, net::CertStatus error) override;
-    virtual void Clear(const base::Callback<bool(const std::string&)>& host_filter) override;
+    void AllowCert(const std::string &, const net::X509Certificate &cert, net::CertStatus error) override;
+    void Clear(const base::Callback<bool(const std::string&)>& host_filter) override;
     virtual CertJudgment QueryPolicy(const std::string &host, const net::X509Certificate &cert,
                                      net::CertStatus error,bool *expired_previous_decision) override;
-    virtual void HostRanInsecureContent(const std::string& host, int child_id, InsecureContentType content_type) override;
-    virtual bool DidHostRunInsecureContent(const std::string& host, int child_id, InsecureContentType content_type) const override;
-    virtual void RevokeUserAllowExceptions(const std::string &host) override;
-    virtual bool HasAllowException(const std::string &host) const override;
+    void HostRanInsecureContent(const std::string& host, int child_id, InsecureContentType content_type) override;
+    bool DidHostRunInsecureContent(const std::string& host, int child_id, InsecureContentType content_type) const override;
+    void RevokeUserAllowExceptions(const std::string &host) override;
+    bool HasAllowException(const std::string &host) const override;
 
 private:
     std::map<std::string, CertPolicy> m_certPolicyforHost;