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/opengl/hellogl | |
| 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/opengl/hellogl')
| -rw-r--r-- | examples/opengl/hellogl/glwidget.h | 14 | ||||
| -rw-r--r-- | examples/opengl/hellogl/window.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/examples/opengl/hellogl/glwidget.h b/examples/opengl/hellogl/glwidget.h index 3344e931e7..0989be1dc6 100644 --- a/examples/opengl/hellogl/glwidget.h +++ b/examples/opengl/hellogl/glwidget.h @@ -54,8 +54,8 @@ public: GLWidget(QWidget *parent = 0); ~GLWidget(); - QSize minimumSizeHint() const; - QSize sizeHint() const; + QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const Q_DECL_OVERRIDE; //! [0] //! [1] @@ -72,11 +72,11 @@ signals: //! [2] protected: - void initializeGL(); - void paintGL(); - void resizeGL(int width, int height); - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); + void initializeGL() Q_DECL_OVERRIDE; + void paintGL() Q_DECL_OVERRIDE; + void resizeGL(int width, int height) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; //! [2] //! [3] diff --git a/examples/opengl/hellogl/window.h b/examples/opengl/hellogl/window.h index 68862fbcfe..900e6b13fc 100644 --- a/examples/opengl/hellogl/window.h +++ b/examples/opengl/hellogl/window.h @@ -57,7 +57,7 @@ public: Window(); protected: - void keyPressEvent(QKeyEvent *event); + void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; private: QSlider *createSlider(); |