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/desktop_screen_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/desktop_screen_qt.h')
| -rw-r--r-- | src/core/desktop_screen_qt.h | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/core/desktop_screen_qt.h b/src/core/desktop_screen_qt.h index 0e7588ae2..f052461a2 100644 --- a/src/core/desktop_screen_qt.h +++ b/src/core/desktop_screen_qt.h @@ -42,24 +42,22 @@ #include "ui/display/screen.h" -#include <QtGlobal> - namespace QtWebEngineCore { class DesktopScreenQt : public display::Screen { public: // Overridden from gfx::Screen: - virtual gfx::Point GetCursorScreenPoint() Q_DECL_OVERRIDE; - virtual bool IsWindowUnderCursor(gfx::NativeWindow) Q_DECL_OVERRIDE; - virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) Q_DECL_OVERRIDE; - virtual int GetNumDisplays() const Q_DECL_OVERRIDE; - virtual std::vector<display::Display> GetAllDisplays() const Q_DECL_OVERRIDE; - virtual display::Display GetDisplayNearestWindow(gfx::NativeView window) const Q_DECL_OVERRIDE; - virtual display::Display GetDisplayNearestPoint(const gfx::Point& point) const Q_DECL_OVERRIDE; - virtual display::Display GetDisplayMatching(const gfx::Rect& match_rect) const Q_DECL_OVERRIDE; - virtual display::Display GetPrimaryDisplay() const Q_DECL_OVERRIDE; - virtual void AddObserver(display::DisplayObserver* observer) Q_DECL_OVERRIDE; - virtual void RemoveObserver(display::DisplayObserver* observer) Q_DECL_OVERRIDE; + gfx::Point GetCursorScreenPoint() override; + bool IsWindowUnderCursor(gfx::NativeWindow) override; + gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override; + int GetNumDisplays() const override; + std::vector<display::Display> GetAllDisplays() const override; + display::Display GetDisplayNearestWindow(gfx::NativeView window) const override; + display::Display GetDisplayNearestPoint(const gfx::Point& point) const override; + display::Display GetDisplayMatching(const gfx::Rect& match_rect) const override; + display::Display GetPrimaryDisplay() const override; + void AddObserver(display::DisplayObserver* observer) override; + void RemoveObserver(display::DisplayObserver* observer) override; }; } // namespace QtWebEngineCore |