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/desktop_screen_qt.h | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'src/core/desktop_screen_qt.h') 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 - 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 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 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 -- cgit v1.2.3