From 40a54bf565079c007eada8755b9ff7224754949d Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 15 Jun 2016 10:12:35 +0200 Subject: Examples: Replace 'Q_DECL_OVERRIDE' by 'override' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Examples should demonstrate best practice, and we can use the keyword directly nowadays. Change-Id: I1f122e5caceca17290757ffbaf3d660e7daa9ae4 Reviewed-by: Topi Reiniö --- examples/gui/analogclock/main.cpp | 4 ++-- examples/gui/openglwindow/main.cpp | 4 ++-- examples/gui/openglwindow/openglwindow.h | 4 ++-- examples/gui/rasterwindow/rasterwindow.h | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'examples/gui') diff --git a/examples/gui/analogclock/main.cpp b/examples/gui/analogclock/main.cpp index 29b21410e3..053ccb54b5 100644 --- a/examples/gui/analogclock/main.cpp +++ b/examples/gui/analogclock/main.cpp @@ -59,8 +59,8 @@ public: AnalogClockWindow(); protected: - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; - void render(QPainter *p) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *) override; + void render(QPainter *p) override; private: int m_timerId; diff --git a/examples/gui/openglwindow/main.cpp b/examples/gui/openglwindow/main.cpp index ba56ba39f5..90c93f0d37 100644 --- a/examples/gui/openglwindow/main.cpp +++ b/examples/gui/openglwindow/main.cpp @@ -63,8 +63,8 @@ class TriangleWindow : public OpenGLWindow public: TriangleWindow(); - void initialize() Q_DECL_OVERRIDE; - void render() Q_DECL_OVERRIDE; + void initialize() override; + void render() override; private: GLuint m_posAttr; diff --git a/examples/gui/openglwindow/openglwindow.h b/examples/gui/openglwindow/openglwindow.h index 820eaf1b8f..276f94f84c 100644 --- a/examples/gui/openglwindow/openglwindow.h +++ b/examples/gui/openglwindow/openglwindow.h @@ -77,9 +77,9 @@ public slots: void renderNow(); protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; - void exposeEvent(QExposeEvent *event) Q_DECL_OVERRIDE; + void exposeEvent(QExposeEvent *event) override; private: bool m_update_pending; diff --git a/examples/gui/rasterwindow/rasterwindow.h b/examples/gui/rasterwindow/rasterwindow.h index f03975a808..be640814d4 100644 --- a/examples/gui/rasterwindow/rasterwindow.h +++ b/examples/gui/rasterwindow/rasterwindow.h @@ -67,10 +67,10 @@ public slots: void renderNow(); protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; - void exposeEvent(QExposeEvent *event) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent *event) override; + void exposeEvent(QExposeEvent *event) override; private: QBackingStore *m_backingStore; -- cgit v1.2.3