From 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 18 Sep 2017 10:36:49 +0200 Subject: Replace Q_DECL_OVERRIDE with override where possible Remaining uses of Q_DECL_OVERRIDE are in: src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.cpp doc/global/qt-cpp-defines.qdocconf (definition and documentation of Q_DECL_OVERRIDE) tests/manual/qcursor/qcursorhighdpi/main.cpp (a test executable compilable both under Qt4 and Qt5) Change-Id: Ib9b05d829add69e98a86238274b6a1fcb19b49ba Reviewed-by: Lars Knoll Reviewed-by: Ville Voutilainen Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/platformsupport/fbconvenience/qfbscreen_p.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/platformsupport/fbconvenience/qfbscreen_p.h') diff --git a/src/platformsupport/fbconvenience/qfbscreen_p.h b/src/platformsupport/fbconvenience/qfbscreen_p.h index 1c27a941cc..eed615de36 100644 --- a/src/platformsupport/fbconvenience/qfbscreen_p.h +++ b/src/platformsupport/fbconvenience/qfbscreen_p.h @@ -78,14 +78,14 @@ public: virtual bool initialize(); - QRect geometry() const Q_DECL_OVERRIDE { return mGeometry; } - int depth() const Q_DECL_OVERRIDE { return mDepth; } - QImage::Format format() const Q_DECL_OVERRIDE { return mFormat; } - QSizeF physicalSize() const Q_DECL_OVERRIDE { return mPhysicalSize; } - QPlatformCursor *cursor() const Q_DECL_OVERRIDE { return mCursor; } + QRect geometry() const override { return mGeometry; } + int depth() const override { return mDepth; } + QImage::Format format() const override { return mFormat; } + QSizeF physicalSize() const override { return mPhysicalSize; } + QPlatformCursor *cursor() const override { return mCursor; } QWindow *topWindow() const; - QWindow *topLevelAt(const QPoint & p) const Q_DECL_OVERRIDE; + QWindow *topLevelAt(const QPoint & p) const override; // compositor api virtual void addWindow(QFbWindow *window); @@ -109,7 +109,7 @@ protected: virtual QRegion doRedraw(); void initializeCompositor(); - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; QFbWindow *windowForId(WId wid) const; -- cgit v1.2.3