diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-10-25 14:20:59 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-11-03 16:28:14 +0100 |
| commit | 089fc2df1b138846b02cdaf693416db21701ca24 (patch) | |
| tree | 1a8efc6f5eca9ee0d6e808a0504162d83d963538 /src/corelib/serialization | |
| parent | 7d75a4850716423c31fd10ddd85fe82e974b695d (diff) | |
Clean up qcontainerfwd.h
Add missing declaration of QVariantList and friends. Replace
class with typename for template parameters.
Remove some left-over forward declarations in other headers.
Change-Id: I31d443019d48b619e02834395dafa40182cac7b9
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/serialization')
| -rw-r--r-- | src/corelib/serialization/qcbormap.h | 4 | ||||
| -rw-r--r-- | src/corelib/serialization/qjsonobject.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/corelib/serialization/qcbormap.h b/src/corelib/serialization/qcbormap.h index 4c0a31c834..97d7d30133 100644 --- a/src/corelib/serialization/qcbormap.h +++ b/src/corelib/serialization/qcbormap.h @@ -47,10 +47,6 @@ QT_BEGIN_NAMESPACE -template <class Key, class T> class QMap; -typedef QMap<QString, QVariant> QVariantMap; -template <class Key, class T> class QHash; -typedef QHash<QString, QVariant> QVariantHash; class QJsonObject; class QDataStream; diff --git a/src/corelib/serialization/qjsonobject.h b/src/corelib/serialization/qjsonobject.h index 2d786e3665..1e6cc65227 100644 --- a/src/corelib/serialization/qjsonobject.h +++ b/src/corelib/serialization/qjsonobject.h @@ -49,10 +49,6 @@ QT_BEGIN_NAMESPACE class QDebug; -template <class Key, class T> class QMap; -typedef QMap<QString, QVariant> QVariantMap; -template <class Key, class T> class QHash; -typedef QHash<QString, QVariant> QVariantHash; class QCborContainerPrivate; |