diff options
author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-21 17:01:03 +0200 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-22 07:30:01 +0000 |
commit | 8762ae7315e9c6c0b2d99cca574fdd089a6eeffd (patch) | |
tree | 8ca53a36e107933ef5a0c23d219ea509d154d6d2 /src/corelib/tools | |
parent | 11604b536619c2e144ee6346cf3ae8d538f57bbf (diff) |
Replace Q_DECL_FINAL with final
Remaining uses of Q_DECL_FINAL are in:
src/corelib/global/qcompilerdetection.h
src/corelib/global/qglobal.cpp
(definition and documentation of Q_DECL_FINAL)
src/tools/moc/moc.cpp
tests/auto/tools/moc/
(supported for moc for Q_DECL_FINAL)
Change-Id: I0d28946c9c3f9d37d0b303db86079129014de1f3
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/tools')
-rw-r--r-- | src/corelib/tools/qtimezoneprivate_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/tools/qtimezoneprivate_p.h b/src/corelib/tools/qtimezoneprivate_p.h index fa7f9f618e..592fcceeef 100644 --- a/src/corelib/tools/qtimezoneprivate_p.h +++ b/src/corelib/tools/qtimezoneprivate_p.h @@ -171,7 +171,7 @@ Q_DECLARE_TYPEINFO(QTimeZonePrivate::Data, Q_MOVABLE_TYPE); template<> QTimeZonePrivate *QSharedDataPointer<QTimeZonePrivate>::clone(); -class Q_AUTOTEST_EXPORT QUtcTimeZonePrivate Q_DECL_FINAL : public QTimeZonePrivate +class Q_AUTOTEST_EXPORT QUtcTimeZonePrivate final : public QTimeZonePrivate { public: // Create default UTC time zone @@ -224,7 +224,7 @@ private: }; #if QT_CONFIG(icu) -class Q_AUTOTEST_EXPORT QIcuTimeZonePrivate Q_DECL_FINAL : public QTimeZonePrivate +class Q_AUTOTEST_EXPORT QIcuTimeZonePrivate final : public QTimeZonePrivate { public: // Create default time zone @@ -285,7 +285,7 @@ Q_DECL_CONSTEXPR inline bool operator==(const QTzTransitionRule &lhs, const QTzT Q_DECL_CONSTEXPR inline bool operator!=(const QTzTransitionRule &lhs, const QTzTransitionRule &rhs) Q_DECL_NOTHROW { return !operator==(lhs, rhs); } -class Q_AUTOTEST_EXPORT QTzTimeZonePrivate Q_DECL_FINAL : public QTimeZonePrivate +class Q_AUTOTEST_EXPORT QTzTimeZonePrivate final : public QTimeZonePrivate { QTzTimeZonePrivate(const QTzTimeZonePrivate &) = default; public: @@ -341,7 +341,7 @@ private: #endif // Q_OS_UNIX #ifdef Q_OS_MAC -class Q_AUTOTEST_EXPORT QMacTimeZonePrivate Q_DECL_FINAL : public QTimeZonePrivate +class Q_AUTOTEST_EXPORT QMacTimeZonePrivate final : public QTimeZonePrivate { public: // Create default time zone @@ -386,7 +386,7 @@ private: #endif // Q_OS_MAC #ifdef Q_OS_WIN -class Q_AUTOTEST_EXPORT QWinTimeZonePrivate Q_DECL_FINAL : public QTimeZonePrivate +class Q_AUTOTEST_EXPORT QWinTimeZonePrivate final : public QTimeZonePrivate { public: struct QWinTransitionRule { @@ -444,7 +444,7 @@ private: #endif // Q_OS_WIN #ifdef Q_OS_ANDROID -class QAndroidTimeZonePrivate Q_DECL_FINAL : public QTimeZonePrivate +class QAndroidTimeZonePrivate final : public QTimeZonePrivate { public: // Create default time zone |