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/kernel/qwidget_p.h | |
| 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/kernel/qwidget_p.h')
| -rw-r--r-- | src/widgets/kernel/qwidget_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index 770ef0731d..6e4c93e7be 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -876,26 +876,26 @@ public: : QGraphicsEffectSourcePrivate(), m_widget(widget), context(0), updateDueToGraphicsEffect(false) {} - inline void detach() + void detach() Q_DECL_OVERRIDE { m_widget->d_func()->graphicsEffect = 0; } - inline const QGraphicsItem *graphicsItem() const + const QGraphicsItem *graphicsItem() const Q_DECL_OVERRIDE { return 0; } - inline const QWidget *widget() const + const QWidget *widget() const Q_DECL_OVERRIDE { return m_widget; } - inline void update() + void update() Q_DECL_OVERRIDE { updateDueToGraphicsEffect = true; m_widget->update(); updateDueToGraphicsEffect = false; } - inline bool isPixmap() const + bool isPixmap() const Q_DECL_OVERRIDE { return false; } - inline void effectBoundingRectChanged() + void effectBoundingRectChanged() Q_DECL_OVERRIDE { // ### This function should take a rect parameter; then we can avoid // updating too much on the parent widget. @@ -905,10 +905,10 @@ public: update(); } - inline const QStyleOption *styleOption() const + const QStyleOption *styleOption() const Q_DECL_OVERRIDE { return 0; } - inline QRect deviceRect() const + QRect deviceRect() const Q_DECL_OVERRIDE { return m_widget->window()->rect(); } QRectF boundingRect(Qt::CoordinateSystem system) const Q_DECL_OVERRIDE; |