From 40a54bf565079c007eada8755b9ff7224754949d Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
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ö <topi.reinio@theqtcompany.com>
---
 examples/corelib/threads/mandelbrot/mandelbrotwidget.h     | 14 +++++++-------
 examples/corelib/threads/mandelbrot/renderthread.h         |  2 +-
 examples/corelib/threads/semaphores/semaphores.cpp         |  4 ++--
 examples/corelib/threads/waitconditions/waitconditions.cpp |  4 ++--
 examples/corelib/tools/contiguouscache/randomlistmodel.h   |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'examples/corelib')

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);
diff --git a/examples/corelib/threads/semaphores/semaphores.cpp b/examples/corelib/threads/semaphores/semaphores.cpp
index f44f709d72..37dd4cda20 100644
--- a/examples/corelib/threads/semaphores/semaphores.cpp
+++ b/examples/corelib/threads/semaphores/semaphores.cpp
@@ -68,7 +68,7 @@ class Producer : public QThread
 //! [1] //! [2]
 {
 public:
-    void run() Q_DECL_OVERRIDE
+    void run() override
     {
         qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
         for (int i = 0; i < DataSize; ++i) {
@@ -86,7 +86,7 @@ class Consumer : public QThread
 {
     Q_OBJECT
 public:
-    void run() Q_DECL_OVERRIDE
+    void run() override
     {
         for (int i = 0; i < DataSize; ++i) {
             usedBytes.acquire();
diff --git a/examples/corelib/threads/waitconditions/waitconditions.cpp b/examples/corelib/threads/waitconditions/waitconditions.cpp
index 7040246937..9eab28f94c 100644
--- a/examples/corelib/threads/waitconditions/waitconditions.cpp
+++ b/examples/corelib/threads/waitconditions/waitconditions.cpp
@@ -74,7 +74,7 @@ public:
     {
     }
 
-    void run() Q_DECL_OVERRIDE
+    void run() override
     {
         qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
 
@@ -105,7 +105,7 @@ public:
     {
     }
 
-    void run() Q_DECL_OVERRIDE
+    void run() override
     {
         for (int i = 0; i < DataSize; ++i) {
             mutex.lock();
diff --git a/examples/corelib/tools/contiguouscache/randomlistmodel.h b/examples/corelib/tools/contiguouscache/randomlistmodel.h
index f1f9bd247e..e6192b434f 100644
--- a/examples/corelib/tools/contiguouscache/randomlistmodel.h
+++ b/examples/corelib/tools/contiguouscache/randomlistmodel.h
@@ -62,8 +62,8 @@ public:
     RandomListModel(QObject *parent = 0);
     ~RandomListModel();
 
-    int rowCount(const QModelIndex & = QModelIndex()) const Q_DECL_OVERRIDE;
-    QVariant data(const QModelIndex &, int) const Q_DECL_OVERRIDE;
+    int rowCount(const QModelIndex & = QModelIndex()) const override;
+    QVariant data(const QModelIndex &, int) const override;
 
 private:
     void cacheRows(int, int) const;
-- 
cgit v1.2.3