diff options
| author | Sérgio Martins <sergio.martins@kdab.com> | 2015-01-30 18:20:08 +0000 |
|---|---|---|
| committer | Sérgio Martins <sergio.martins@kdab.com> | 2015-02-03 22:52:14 +0000 |
| commit | ad2ea165501c23cbd85c4ddb155f2d7ea8fc85b8 (patch) | |
| tree | a6f78e3f3448418d8cac1dc6b77e9d44d8333201 /src/widgets/widgets | |
| parent | b2595bd015ef17a38af4fec301317b2621cfb5bb (diff) | |
Fix 1700 override warnings [-Winconsistent-missing-override]
Classes should either use or not use override, otherwise it hurts
code readability.
Some inline keywords were removed because of an error with MSVC2010:
error C2216: 'override' cannot be used with 'inline'
Change-Id: I7276d5525a92281bd0d743beb11d0dc73441443b
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/widgets/widgets')
| -rw-r--r-- | src/widgets/widgets/qabstractbutton.h | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qdockwidget.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qmdiarea_p.h | 6 | ||||
| -rw-r--r-- | src/widgets/widgets/qtabbar_p.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/widgets/widgets/qabstractbutton.h b/src/widgets/widgets/qabstractbutton.h index c80e2e9d5d..400233caa9 100644 --- a/src/widgets/widgets/qabstractbutton.h +++ b/src/widgets/widgets/qabstractbutton.h @@ -117,7 +117,7 @@ Q_SIGNALS: void toggled(bool checked); protected: - virtual void paintEvent(QPaintEvent *e) = 0; + void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE = 0; virtual bool hitButton(const QPoint &pos) const; virtual void checkStateSet(); virtual void nextCheckState(); diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index 24c0323691..a0a51fb609 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -110,7 +110,7 @@ public: QDockWidgetTitleButton(QDockWidget *dockWidget); QSize sizeHint() const Q_DECL_OVERRIDE; - inline QSize minimumSizeHint() const + QSize minimumSizeHint() const Q_DECL_OVERRIDE { return sizeHint(); } void enterEvent(QEvent *event) Q_DECL_OVERRIDE; diff --git a/src/widgets/widgets/qmdiarea_p.h b/src/widgets/widgets/qmdiarea_p.h index d1341d5837..170584a803 100644 --- a/src/widgets/widgets/qmdiarea_p.h +++ b/src/widgets/widgets/qmdiarea_p.h @@ -82,7 +82,7 @@ class RegularTiler : public Rearranger // covering the entire domain. // Both positions and sizes may change. void rearrange(QList<QWidget *> &widgets, const QRect &domain) const Q_DECL_OVERRIDE; - inline Type type() const { return Rearranger::RegularTiler; } + Type type() const Q_DECL_OVERRIDE { return Rearranger::RegularTiler; } }; class SimpleCascader : public Rearranger @@ -91,7 +91,7 @@ class SimpleCascader : public Rearranger // Widgets are resized to minimumSize. // Both positions and sizes may change. void rearrange(QList<QWidget *> &widgets, const QRect &domain) const Q_DECL_OVERRIDE; - inline Type type() const { return Rearranger::SimpleCascader; } + Type type() const Q_DECL_OVERRIDE { return Rearranger::SimpleCascader; } }; class IconTiler : public Rearranger @@ -100,7 +100,7 @@ class IconTiler : public Rearranger // tiling pattern filling up the domain from the bottom. // Only positions may change. void rearrange(QList<QWidget *> &widgets, const QRect &domain) const Q_DECL_OVERRIDE; - inline Type type() const { return Rearranger::IconTiler; } + Type type() const Q_DECL_OVERRIDE { return Rearranger::IconTiler; } }; class Placer diff --git a/src/widgets/widgets/qtabbar_p.h b/src/widgets/widgets/qtabbar_p.h index 747dcd3a58..7a36e2e92d 100644 --- a/src/widgets/widgets/qtabbar_p.h +++ b/src/widgets/widgets/qtabbar_p.h @@ -251,7 +251,7 @@ public: CloseButton(QWidget *parent = 0); QSize sizeHint() const Q_DECL_OVERRIDE; - inline QSize minimumSizeHint() const + QSize minimumSizeHint() const Q_DECL_OVERRIDE { return sizeHint(); } void enterEvent(QEvent *event) Q_DECL_OVERRIDE; void leaveEvent(QEvent *event) Q_DECL_OVERRIDE; |