diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-12 11:58:21 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-04-21 11:10:13 +0000 |
commit | a5c1754faa7bd9491fcf64dda34b479cdf62c9bd (patch) | |
tree | 61a093917f9c8308d2153335d49c58acc3836981 /src/core/content_main_delegate_qt.h | |
parent | d08524fbfbb78eca09bbab58d5a9840387d2d0e7 (diff) |
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>
Diffstat (limited to 'src/core/content_main_delegate_qt.h')
-rw-r--r-- | src/core/content_main_delegate_qt.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/content_main_delegate_qt.h b/src/core/content_main_delegate_qt.h index 3cb3b3bb3..407687c81 100644 --- a/src/core/content_main_delegate_qt.h +++ b/src/core/content_main_delegate_qt.h @@ -42,8 +42,6 @@ #include "content/public/app/content_main_delegate.h" -#include <QtCore/qcompilerdetection.h> - #include "content_browser_client_qt.h" namespace QtWebEngineCore { @@ -54,12 +52,12 @@ public: // This is where the embedder puts all of its startup code that needs to run // before the sandbox is engaged. - void PreSandboxStartup() Q_DECL_OVERRIDE; + void PreSandboxStartup() override; - content::ContentBrowserClient* CreateContentBrowserClient() Q_DECL_OVERRIDE; - content::ContentRendererClient* CreateContentRendererClient() Q_DECL_OVERRIDE; + content::ContentBrowserClient* CreateContentBrowserClient() override; + content::ContentRendererClient* CreateContentRendererClient() override; - bool BasicStartupComplete(int* /*exit_code*/) Q_DECL_OVERRIDE; + bool BasicStartupComplete(int* /*exit_code*/) override; private: std::unique_ptr<ContentBrowserClientQt> m_browserClient; |