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/printsupport/dialogs/qprintdialog.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/printsupport/dialogs/qprintdialog.h')
-rw-r--r-- | src/printsupport/dialogs/qprintdialog.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/printsupport/dialogs/qprintdialog.h b/src/printsupport/dialogs/qprintdialog.h index 5b81440a3c..20ef1c7fed 100644 --- a/src/printsupport/dialogs/qprintdialog.h +++ b/src/printsupport/dialogs/qprintdialog.h @@ -63,11 +63,11 @@ public: explicit QPrintDialog(QWidget *parent = Q_NULLPTR); ~QPrintDialog(); - int exec() Q_DECL_OVERRIDE; + int exec() override; #if defined (Q_OS_UNIX) && !defined(Q_OS_MAC) - virtual void accept() Q_DECL_OVERRIDE; + virtual void accept() override; #endif - void done(int result) Q_DECL_OVERRIDE; + void done(int result) override; void setOption(PrintDialogOption option, bool on = true); bool testOption(PrintDialogOption option) const; @@ -75,7 +75,7 @@ public: PrintDialogOptions options() const; #if defined(Q_OS_UNIX) || defined(Q_OS_WIN) - void setVisible(bool visible) Q_DECL_OVERRIDE; + void setVisible(bool visible) override; #endif using QDialog::open; |