summaryrefslogtreecommitdiffstats
path: root/examples/widgets/mainwindows/mainwindow/colorswatch.h
diff options
context:
space:
mode:
authorhjk <hjk@theqtcompany.com>2016-06-15 10:12:35 +0200
committerhjk <hjk@theqtcompany.com>2016-06-15 09:32:30 +0000
commit40a54bf565079c007eada8755b9ff7224754949d (patch)
treeccd3bb45ca7369b79fc54d26955cf5b0dfc8ece1 /examples/widgets/mainwindows/mainwindow/colorswatch.h
parent4d3ffae3d562e5b3b2748a2d92eb4ab2933422e7 (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/widgets/mainwindows/mainwindow/colorswatch.h')
-rw-r--r--examples/widgets/mainwindows/mainwindow/colorswatch.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/widgets/mainwindows/mainwindow/colorswatch.h b/examples/widgets/mainwindows/mainwindow/colorswatch.h
index c2f6ef19b9..ec9d9e7372 100644
--- a/examples/widgets/mainwindows/mainwindow/colorswatch.h
+++ b/examples/widgets/mainwindows/mainwindow/colorswatch.h
@@ -69,9 +69,9 @@ public:
protected:
#ifndef QT_NO_CONTEXTMENU
- void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE;
+ void contextMenuEvent(QContextMenuEvent *event) override;
#endif // QT_NO_CONTEXTMENU
- void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE;
+ void resizeEvent(QResizeEvent *e) override;
private slots:
void changeClosable(bool on);
@@ -130,12 +130,12 @@ class BlueTitleBar : public QWidget
public:
explicit BlueTitleBar(QWidget *parent = Q_NULLPTR);
- QSize sizeHint() const Q_DECL_OVERRIDE { return minimumSizeHint(); }
- QSize minimumSizeHint() const Q_DECL_OVERRIDE;
+ QSize sizeHint() const override { return minimumSizeHint(); }
+ QSize minimumSizeHint() const override;
protected:
- void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
- void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
+ void paintEvent(QPaintEvent *event) override;
+ void mouseReleaseEvent(QMouseEvent *event) override;
public slots:
void updateMask();