From 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 18 Sep 2017 10:36:49 +0200 Subject: 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 Reviewed-by: Ville Voutilainen Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/printsupport/dialogs/qpagesetupdialog.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/printsupport/dialogs/qpagesetupdialog.h') diff --git a/src/printsupport/dialogs/qpagesetupdialog.h b/src/printsupport/dialogs/qpagesetupdialog.h index 3bd752a413..61edcc3370 100644 --- a/src/printsupport/dialogs/qpagesetupdialog.h +++ b/src/printsupport/dialogs/qpagesetupdialog.h @@ -62,14 +62,14 @@ public: ~QPageSetupDialog(); #if defined(Q_OS_MAC) || defined(Q_OS_WIN) - void setVisible(bool visible) Q_DECL_OVERRIDE; + void setVisible(bool visible) override; #endif - int exec() Q_DECL_OVERRIDE; + int exec() override; using QDialog::open; void open(QObject *receiver, const char *member); - void done(int result) Q_DECL_OVERRIDE; + void done(int result) override; QPrinter *printer(); }; -- cgit v1.2.3