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/tools/uic/cpp/cppwriteinitialization.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/tools/uic/cpp/cppwriteinitialization.h')
-rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h index b26f51875d..64cbde13f7 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.h +++ b/src/tools/uic/cpp/cppwriteinitialization.h @@ -93,41 +93,41 @@ struct WriteInitialization : public TreeWalker // // widgets // - void acceptUI(DomUI *node) Q_DECL_OVERRIDE; - void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; + void acceptUI(DomUI *node) override; + void acceptWidget(DomWidget *node) override; - void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE; - void acceptSpacer(DomSpacer *node) Q_DECL_OVERRIDE; - void acceptLayoutItem(DomLayoutItem *node) Q_DECL_OVERRIDE; + void acceptLayout(DomLayout *node) override; + void acceptSpacer(DomSpacer *node) override; + void acceptLayoutItem(DomLayoutItem *node) override; // // actions // - void acceptActionGroup(DomActionGroup *node) Q_DECL_OVERRIDE; - void acceptAction(DomAction *node) Q_DECL_OVERRIDE; - void acceptActionRef(DomActionRef *node) Q_DECL_OVERRIDE; + void acceptActionGroup(DomActionGroup *node) override; + void acceptAction(DomAction *node) override; + void acceptActionRef(DomActionRef *node) override; // // tab stops // - void acceptTabStops(DomTabStops *tabStops) Q_DECL_OVERRIDE; + void acceptTabStops(DomTabStops *tabStops) override; // // custom widgets // - void acceptCustomWidgets(DomCustomWidgets *node) Q_DECL_OVERRIDE; - void acceptCustomWidget(DomCustomWidget *node) Q_DECL_OVERRIDE; + void acceptCustomWidgets(DomCustomWidgets *node) override; + void acceptCustomWidget(DomCustomWidget *node) override; // // layout defaults/functions // - void acceptLayoutDefault(DomLayoutDefault *node) Q_DECL_OVERRIDE { m_LayoutDefaultHandler.acceptLayoutDefault(node); } - void acceptLayoutFunction(DomLayoutFunction *node) Q_DECL_OVERRIDE { m_LayoutDefaultHandler.acceptLayoutFunction(node); } + void acceptLayoutDefault(DomLayoutDefault *node) override { m_LayoutDefaultHandler.acceptLayoutDefault(node); } + void acceptLayoutFunction(DomLayoutFunction *node) override { m_LayoutDefaultHandler.acceptLayoutFunction(node); } // // signal/slot connections // - void acceptConnection(DomConnection *connection) Q_DECL_OVERRIDE; + void acceptConnection(DomConnection *connection) override; enum { Use43UiFile = 0, |