summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-06-02 07:29:40 +0200
committerMontel Laurent <[email protected]>2017-06-02 07:29:40 +0200
commitb7ba930b3af88ce3effab30e6898a1b9245a0218 (patch)
tree2c2240c19dc11eb299a9ef0a5855f342a7e23a40
parentdbfedbeafa33fad27fcb9be3fe75b5ba7d27999d (diff)
Use Q_DECLARE_OVERRIDE
-rw-r--r--src/editor.h6
-rw-r--r--src/frameimage.h8
-rw-r--r--src/gameitem.h6
-rw-r--r--src/gamescene.h6
-rw-r--r--src/gameview.h4
-rw-r--r--src/kmahjongg.h4
6 files changed, 17 insertions, 17 deletions
diff --git a/src/editor.h b/src/editor.h
index da3d3f7..b36e165 100644
--- a/src/editor.h
+++ b/src/editor.h
@@ -65,8 +65,8 @@ protected slots:
void slotModeChanged(QAction *);
protected:
- void resizeEvent(QResizeEvent * event);
- void paintEvent(QPaintEvent * pa);
+ void resizeEvent(QResizeEvent * event) Q_DECL_OVERRIDE;
+ void paintEvent(QPaintEvent * pa) Q_DECL_OVERRIDE;
void setupToolbar();
void drawBackground(QPixmap * to) const;
@@ -83,7 +83,7 @@ protected:
/**
* Override the closeEvent(...) method of qdialog. */
- void closeEvent(QCloseEvent * e);
+ void closeEvent(QCloseEvent * e) Q_DECL_OVERRIDE;
/**
* Update the tile size. */
diff --git a/src/frameimage.h b/src/frameimage.h
index debd83b..c722dc2 100644
--- a/src/frameimage.h
+++ b/src/frameimage.h
@@ -52,10 +52,10 @@ signals:
void mouseMoved(QMouseEvent * e);
protected:
- void mousePressEvent(QMouseEvent * e);
- void mouseMoveEvent(QMouseEvent * e);
- void resizeEvent(QResizeEvent * e);
- void paintEvent(QPaintEvent * pa);
+ void mousePressEvent(QMouseEvent * e) Q_DECL_OVERRIDE;
+ void mouseMoveEvent(QMouseEvent * e) Q_DECL_OVERRIDE;
+ void resizeEvent(QResizeEvent * e) Q_DECL_OVERRIDE;
+ void paintEvent(QPaintEvent * pa) Q_DECL_OVERRIDE;
private:
int m_rx;
diff --git a/src/gameitem.h b/src/gameitem.h
index 5451742..811fb9b 100644
--- a/src/gameitem.h
+++ b/src/gameitem.h
@@ -104,12 +104,12 @@ public:
/**
* Overrides the paint method of QGraphicsItem. */
- virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option,
- QWidget * widget);
+ void paint(QPainter * painter, const QStyleOptionGraphicsItem * option,
+ QWidget * widget) Q_DECL_OVERRIDE;
/**
* Overrides the boundingRect method of QGraphicsItem. */
- virtual QRectF boundingRect() const;
+ QRectF boundingRect() const Q_DECL_OVERRIDE;
/**
* Returns the rect of the item.
diff --git a/src/gamescene.h b/src/gamescene.h
index 26e046a..912a5cd 100644
--- a/src/gamescene.h
+++ b/src/gamescene.h
@@ -100,16 +100,16 @@ public:
/**
* Override from QGraphicsScene. */
- void mouseDoubleClickEvent(QGraphicsSceneMouseEvent * mouseEvent);
+ void mouseDoubleClickEvent(QGraphicsSceneMouseEvent * mouseEvent) Q_DECL_OVERRIDE;
/**
* Override from QGraphicsScene. */
- void mousePressEvent(QGraphicsSceneMouseEvent * mouseEvent);
+ void mousePressEvent(QGraphicsSceneMouseEvent * mouseEvent) Q_DECL_OVERRIDE;
/**
* Override from QGraphicsScene.
* Mouse wheel rotates view. */
- void wheelEvent(QGraphicsSceneWheelEvent * mouseEvent);
+ void wheelEvent(QGraphicsSceneWheelEvent * mouseEvent) Q_DECL_OVERRIDE;
/**
* Test if the item is selectable or not.
diff --git a/src/gameview.h b/src/gameview.h
index 34b3c95..9d196e0 100644
--- a/src/gameview.h
+++ b/src/gameview.h
@@ -262,11 +262,11 @@ public slots:
protected:
/**
* Override from QGraphicsView. */
- virtual void resizeEvent(QResizeEvent * event);
+ void resizeEvent(QResizeEvent * event) Q_DECL_OVERRIDE;
/**
* Override from QGraphicsView. */
- virtual void mousePressEvent(QMouseEvent * mouseEvent);
+ void mousePressEvent(QMouseEvent * mouseEvent) Q_DECL_OVERRIDE;
signals:
/**
diff --git a/src/kmahjongg.h b/src/kmahjongg.h
index 8a5fa8e..9923d80 100644
--- a/src/kmahjongg.h
+++ b/src/kmahjongg.h
@@ -60,8 +60,8 @@ public slots:
protected:
void setupKAction();
void setupStatusBar();
- void changeEvent(QEvent * event);
- void closeEvent(QCloseEvent * event);
+ void changeEvent(QEvent * event) Q_DECL_OVERRIDE;
+ void closeEvent(QCloseEvent * event) Q_DECL_OVERRIDE;
private slots:
void showSettings();