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_client_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_client_qt.h')
| -rw-r--r-- | src/core/content_client_qt.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/core/content_client_qt.h b/src/core/content_client_qt.h index 4fd539bf3..7104b98b6 100644 --- a/src/core/content_client_qt.h +++ b/src/core/content_client_qt.h @@ -43,7 +43,6 @@ #include "base/strings/string_piece.h" #include "content/public/common/content_client.h" #include "ui/base/layout.h" -#include <QtCore/qcompilerdetection.h> // Needed for Q_DECL_OVERRIDE namespace QtWebEngineCore { @@ -52,14 +51,14 @@ public: static std::string getUserAgent(); #if defined(ENABLE_PLUGINS) - virtual void AddPepperPlugins(std::vector<content::PepperPluginInfo>* plugins) Q_DECL_OVERRIDE; + void AddPepperPlugins(std::vector<content::PepperPluginInfo>* plugins) override; #endif - virtual base::StringPiece GetDataResource(int, ui::ScaleFactor) const Q_DECL_OVERRIDE; - virtual base::RefCountedMemory* GetDataResourceBytes(int resource_id) const Q_DECL_OVERRIDE; - virtual std::string GetUserAgent() const Q_DECL_OVERRIDE { return getUserAgent(); } - virtual base::string16 GetLocalizedString(int message_id) const Q_DECL_OVERRIDE; - virtual std::string GetProduct() const Q_DECL_OVERRIDE; + base::StringPiece GetDataResource(int, ui::ScaleFactor) const override; + base::RefCountedMemory* GetDataResourceBytes(int resource_id) const override; + std::string GetUserAgent() const override { return getUserAgent(); } + base::string16 GetLocalizedString(int message_id) const override; + std::string GetProduct() const override; }; } // namespace QtWebEngineCore |