diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2014-07-14 09:13:02 +0200 |
---|---|---|
committer | Olivier Goffart <ogoffart@woboq.com> | 2014-07-15 08:44:44 +0200 |
commit | 3b0c2b7c1b3ccdfe6867884a7e210bfc63e10f84 (patch) | |
tree | 4c75a4fa9f023c4bfc6746a4412922a8efe3b017 /examples/widgets/tools/plugandpaintplugins | |
parent | 6d87e3ed40173eac8c275d5926266359d53c74c7 (diff) |
Examples: Add Q_DECL_OVERRIDE to overridden functions
Q_DECL_OVERRIDE (which expands to 'override' for supported compiler)
helps to declare the intent (that it is an overridden function) and
force compilation error when there is no such virtual function in the
base class.
The examples should show the best practice of having it, as it may save
the programmer quite some time in case of change of API or typo in the
function name or arguments.
This change was done automatically with
clang-modernize -add-override -override-macros
And fixed MSVC compilation by removing inline for TorrentViewDelegate::paint
Change-Id: Ice66ae93fae571266f908703d5b8892b2c1ebb1a
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'examples/widgets/tools/plugandpaintplugins')
-rw-r--r-- | examples/widgets/tools/plugandpaintplugins/basictools/basictoolsplugin.h | 16 | ||||
-rw-r--r-- | examples/widgets/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/examples/widgets/tools/plugandpaintplugins/basictools/basictoolsplugin.h b/examples/widgets/tools/plugandpaintplugins/basictools/basictoolsplugin.h index 55593f6db0..121501a878 100644 --- a/examples/widgets/tools/plugandpaintplugins/basictools/basictoolsplugin.h +++ b/examples/widgets/tools/plugandpaintplugins/basictools/basictoolsplugin.h @@ -68,22 +68,22 @@ class BasicToolsPlugin : public QObject, public: //! [1] // BrushInterface - QStringList brushes() const; + QStringList brushes() const Q_DECL_OVERRIDE; QRect mousePress(const QString &brush, QPainter &painter, - const QPoint &pos); + const QPoint &pos) Q_DECL_OVERRIDE; QRect mouseMove(const QString &brush, QPainter &painter, - const QPoint &oldPos, const QPoint &newPos); + const QPoint &oldPos, const QPoint &newPos) Q_DECL_OVERRIDE; QRect mouseRelease(const QString &brush, QPainter &painter, - const QPoint &pos); + const QPoint &pos) Q_DECL_OVERRIDE; // ShapeInterface - QStringList shapes() const; - QPainterPath generateShape(const QString &shape, QWidget *parent); + QStringList shapes() const Q_DECL_OVERRIDE; + QPainterPath generateShape(const QString &shape, QWidget *parent) Q_DECL_OVERRIDE; // FilterInterface - QStringList filters() const; + QStringList filters() const Q_DECL_OVERRIDE; QImage filterImage(const QString &filter, const QImage &image, - QWidget *parent); + QWidget *parent) Q_DECL_OVERRIDE; //! [3] }; //! [2] //! [3] diff --git a/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h b/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h index 6f793b26c6..bc0bae3152 100644 --- a/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h +++ b/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h @@ -56,9 +56,9 @@ class ExtraFiltersPlugin : public QObject, public FilterInterface Q_INTERFACES(FilterInterface) public: - QStringList filters() const; + QStringList filters() const Q_DECL_OVERRIDE; QImage filterImage(const QString &filter, const QImage &image, - QWidget *parent); + QWidget *parent) Q_DECL_OVERRIDE; }; //! [0] |