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/cppwriteincludes.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/cppwriteincludes.h')
-rw-r--r-- | src/tools/uic/cpp/cppwriteincludes.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/tools/uic/cpp/cppwriteincludes.h b/src/tools/uic/cpp/cppwriteincludes.h index 0d9c293efc..f91e1cf8ff 100644 --- a/src/tools/uic/cpp/cppwriteincludes.h +++ b/src/tools/uic/cpp/cppwriteincludes.h @@ -49,23 +49,23 @@ struct WriteIncludes : public TreeWalker { WriteIncludes(Uic *uic); - void acceptUI(DomUI *node) Q_DECL_OVERRIDE; - void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; - void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE; - void acceptSpacer(DomSpacer *node) Q_DECL_OVERRIDE; - void acceptProperty(DomProperty *node) Q_DECL_OVERRIDE; + void acceptUI(DomUI *node) override; + void acceptWidget(DomWidget *node) override; + void acceptLayout(DomLayout *node) override; + void acceptSpacer(DomSpacer *node) override; + void acceptProperty(DomProperty *node) 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; // // include hints // - void acceptIncludes(DomIncludes *node) Q_DECL_OVERRIDE; - void acceptInclude(DomInclude *node) Q_DECL_OVERRIDE; + void acceptIncludes(DomIncludes *node) override; + void acceptInclude(DomInclude *node) override; private: void add(const QString &className, bool determineHeader = true, const QString &header = QString(), bool global = false); |