From a5c1754faa7bd9491fcf64dda34b479cdf62c9bd Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 12 Apr 2017 11:58:21 +0200 Subject: 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 --- src/core/renderer/content_renderer_client_qt.h | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'src/core/renderer/content_renderer_client_qt.h') 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 #include 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>* 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>* 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 m_visitedLinkSlave; -- cgit v1.2.3