diff options
author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-18 10:36:49 +0200 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-19 11:53:42 +0000 |
commit | 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 (patch) | |
tree | 330914ff8225867e19b9ed5e049813d9f1e5ec08 /src/widgets/graphicsview/qgraphicswidget_p.h | |
parent | 93dd85141b35460a83dac86083581ba1c1975927 (diff) |
Replace Q_DECL_OVERRIDE with override where possible
Remaining uses of Q_DECL_OVERRIDE are in:
src/corelib/global/qcompilerdetection.h
src/corelib/global/qglobal.cpp
doc/global/qt-cpp-defines.qdocconf
(definition and documentation of Q_DECL_OVERRIDE)
tests/manual/qcursor/qcursorhighdpi/main.cpp
(a test executable compilable both under Qt4 and Qt5)
Change-Id: Ib9b05d829add69e98a86238274b6a1fcb19b49ba
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/widgets/graphicsview/qgraphicswidget_p.h')
-rw-r--r-- | src/widgets/graphicsview/qgraphicswidget_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/widgets/graphicsview/qgraphicswidget_p.h b/src/widgets/graphicsview/qgraphicswidget_p.h index 0fb9fbba07..505a2a24c0 100644 --- a/src/widgets/graphicsview/qgraphicswidget_p.h +++ b/src/widgets/graphicsview/qgraphicswidget_p.h @@ -94,13 +94,13 @@ public: QPalette palette; uint inheritedPaletteResolveMask; void setPalette_helper(const QPalette &palette); - void resolvePalette(uint inheritedMask) Q_DECL_OVERRIDE; + void resolvePalette(uint inheritedMask) override; void updatePalette(const QPalette &palette); QPalette naturalWidgetPalette() const; QFont font; uint inheritedFontResolveMask; void setFont_helper(const QFont &font); - void resolveFont(uint inheritedMask) Q_DECL_OVERRIDE; + void resolveFont(uint inheritedMask) override; void updateFont(const QFont &font); QFont naturalWidgetFont() const; @@ -115,13 +115,13 @@ public: bool hasDecoration() const; // Private Properties - qreal width() const Q_DECL_OVERRIDE; - void setWidth(qreal) Q_DECL_OVERRIDE; - void resetWidth() Q_DECL_OVERRIDE; + qreal width() const override; + void setWidth(qreal) override; + void resetWidth() override; - qreal height() const Q_DECL_OVERRIDE; - void setHeight(qreal) Q_DECL_OVERRIDE; - void resetHeight() Q_DECL_OVERRIDE; + qreal height() const override; + void setHeight(qreal) override; + void resetHeight() override; void setGeometryFromSetPos(); // State |