diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-10-25 14:32:46 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-11-03 16:28:14 +0100 |
| commit | 5646f46ec98b3459ff4da7101eee27f4539d4229 (patch) | |
| tree | 7491481e6527e5bb35265d63681c6a6876f2556d /src/corelib/kernel/qmetatype.h | |
| parent | 089fc2df1b138846b02cdaf693416db21701ca24 (diff) | |
Clean up container metatype declarations in QMetaType
Remove forward declarations, we have those already from qcontainerfwd.h.
Change-Id: I1b8a91ece912e6cdf747f4e2a750f0e85bcb5b2a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/corelib/kernel/qmetatype.h')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 15f72927f8..86cd15def8 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -1435,9 +1435,6 @@ struct QMetaTypeId< SMART_POINTER<T> > \ QT_END_NAMESPACE #define Q_DECLARE_SEQUENTIAL_CONTAINER_METATYPE_ITER(TEMPLATENAME) \ - QT_BEGIN_NAMESPACE \ - template <class T> class TEMPLATENAME; \ - QT_END_NAMESPACE \ Q_DECLARE_METATYPE_TEMPLATE_1ARG(TEMPLATENAME) QT_END_NAMESPACE @@ -1451,15 +1448,6 @@ QT_FOR_EACH_AUTOMATIC_TEMPLATE_1ARG(Q_DECLARE_SEQUENTIAL_CONTAINER_METATYPE_ITER Q_DECLARE_SEQUENTIAL_CONTAINER_METATYPE(std::vector) Q_DECLARE_SEQUENTIAL_CONTAINER_METATYPE(std::list) -#define Q_FORWARD_DECLARE_METATYPE_TEMPLATE_2ARG_ITER(TEMPLATENAME, CPPTYPE) \ - QT_BEGIN_NAMESPACE \ - template <class T1, class T2> CPPTYPE TEMPLATENAME; \ - QT_END_NAMESPACE \ - -QT_FOR_EACH_AUTOMATIC_TEMPLATE_2ARG(Q_FORWARD_DECLARE_METATYPE_TEMPLATE_2ARG_ITER) - -#undef Q_DECLARE_METATYPE_TEMPLATE_2ARG_ITER - #define Q_DECLARE_ASSOCIATIVE_CONTAINER_METATYPE(TEMPLATENAME) \ QT_BEGIN_NAMESPACE \ namespace QtPrivate { \ |