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/kernel/qvariant_p.h | |
| 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/kernel/qvariant_p.h')
| -rw-r--r-- | src/corelib/kernel/qvariant_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h index 75c269d710..b22b7c231e 100644 --- a/src/corelib/kernel/qvariant_p.h +++ b/src/corelib/kernel/qvariant_p.h @@ -278,11 +278,11 @@ class QVariantIsNull Q_STATIC_ASSERT(!HasIsNullMethod<SelfTest2>::Value); struct SelfTest3 : public SelfTest1 {}; Q_STATIC_ASSERT(HasIsNullMethod<SelfTest3>::Value); - struct SelfTestFinal1 Q_DECL_FINAL { bool isNull() const; }; + struct SelfTestFinal1 final { bool isNull() const; }; Q_STATIC_ASSERT(HasIsNullMethod<SelfTestFinal1>::Value); - struct SelfTestFinal2 Q_DECL_FINAL {}; + struct SelfTestFinal2 final {}; Q_STATIC_ASSERT(!HasIsNullMethod<SelfTestFinal2>::Value); - struct SelfTestFinal3 Q_DECL_FINAL : public SelfTest1 {}; + struct SelfTestFinal3 final : public SelfTest1 {}; Q_STATIC_ASSERT(HasIsNullMethod<SelfTestFinal3>::Value); template<typename T, bool HasIsNull = HasIsNullMethod<T>::Value> |