diff options
| author | hjk <hjk@theqtcompany.com> | 2016-06-15 10:12:35 +0200 |
|---|---|---|
| committer | hjk <hjk@theqtcompany.com> | 2016-06-15 09:32:30 +0000 |
| commit | 40a54bf565079c007eada8755b9ff7224754949d (patch) | |
| tree | ccd3bb45ca7369b79fc54d26955cf5b0dfc8ece1 /examples/corelib/threads/mandelbrot | |
| parent | 4d3ffae3d562e5b3b2748a2d92eb4ab2933422e7 (diff) | |
Examples: Replace 'Q_DECL_OVERRIDE' by 'override'
Examples should demonstrate best practice, and we can use the keyword
directly nowadays.
Change-Id: I1f122e5caceca17290757ffbaf3d660e7daa9ae4
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
Diffstat (limited to 'examples/corelib/threads/mandelbrot')
| -rw-r--r-- | examples/corelib/threads/mandelbrot/mandelbrotwidget.h | 14 | ||||
| -rw-r--r-- | examples/corelib/threads/mandelbrot/renderthread.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/examples/corelib/threads/mandelbrot/mandelbrotwidget.h b/examples/corelib/threads/mandelbrot/mandelbrotwidget.h index 14946b44fb..cbacc2cdd0 100644 --- a/examples/corelib/threads/mandelbrot/mandelbrotwidget.h +++ b/examples/corelib/threads/mandelbrot/mandelbrotwidget.h @@ -65,15 +65,15 @@ public: MandelbrotWidget(QWidget *parent = 0); protected: - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; + void resizeEvent(QResizeEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; #ifndef QT_NO_WHEELEVENT - void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *event) override; #endif - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; private slots: void updatePixmap(const QImage &image, double scaleFactor); diff --git a/examples/corelib/threads/mandelbrot/renderthread.h b/examples/corelib/threads/mandelbrot/renderthread.h index b9b59ba4cf..b5e9226fb8 100644 --- a/examples/corelib/threads/mandelbrot/renderthread.h +++ b/examples/corelib/threads/mandelbrot/renderthread.h @@ -75,7 +75,7 @@ signals: void renderedImage(const QImage &image, double scaleFactor); protected: - void run() Q_DECL_OVERRIDE; + void run() override; private: uint rgbFromWaveLength(double wave); |