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 | |
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')
-rw-r--r-- | src/corelib/kernel/qmetatype.h | 10 | ||||
-rw-r--r-- | src/corelib/serialization/qcbormap.h | 4 | ||||
-rw-r--r-- | src/corelib/serialization/qjsonobject.h | 4 | ||||
-rw-r--r-- | src/corelib/tools/qcontainerfwd.h | 25 | ||||
-rw-r--r-- | src/corelib/tools/qhash.h | 4 | ||||
-rw-r--r-- | src/gui/kernel/qwindowdefs.h | 3 |
6 files changed, 17 insertions, 33 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index d599f2582e..15f72927f8 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -1305,16 +1305,6 @@ QT_FOR_EACH_STATIC_WIDGETS_CLASS(QT_FORWARD_DECLARE_STATIC_TYPES_ITER) #undef QT_FORWARD_DECLARE_STATIC_TYPES_ITER -typedef QList<QVariant> QVariantList; -typedef QMap<QString, QVariant> QVariantMap; -typedef QHash<QString, QVariant> QVariantHash; -typedef QPair<QVariant, QVariant> QVariantPair; -#ifdef Q_CLANG_QDOC -class QByteArrayList; -#else -using QByteArrayList = QList<QByteArray>; -#endif - #define Q_DECLARE_METATYPE_TEMPLATE_1ARG(SINGLE_ARG_TEMPLATE) \ QT_BEGIN_NAMESPACE \ template <typename T> \ 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; diff --git a/src/corelib/tools/qcontainerfwd.h b/src/corelib/tools/qcontainerfwd.h index b9a50e4d60..96480c4a8a 100644 --- a/src/corelib/tools/qcontainerfwd.h +++ b/src/corelib/tools/qcontainerfwd.h @@ -48,18 +48,18 @@ QT_BEGIN_NAMESPACE -template <class Key, class T> class QCache; -template <class Key, class T> class QHash; -template <class Key, class T> class QMap; -template <class Key, class T> class QMultiHash; -template <class Key, class T> class QMultiMap; +template <typename Key, typename T> class QCache; +template <typename Key, typename T> class QHash; +template <typename Key, typename T> class QMap; +template <typename Key, typename T> class QMultiHash; +template <typename Key, typename T> class QMultiMap; template <typename T1, typename T2> using QPair = std::pair<T1, T2>; -template <class T> class QQueue; -template <class T> class QSet; -template <class T> class QStack; -template<class T, qsizetype Prealloc = 256> class QVarLengthArray; -template <class T> class QList; +template <typename T> class QQueue; +template <typename T> class QSet; +template <typename T> class QStack; +template <typename T, qsizetype Prealloc = 256> class QVarLengthArray; +template <typename T> class QList; #ifndef Q_CLANG_QDOC template<typename T> using QVector = QList<T>; using QStringList = QList<QString>; @@ -72,6 +72,11 @@ class QByteArrayList; class QMetaType; class QVariant; +using QVariantList = QList<QVariant>; +using QVariantMap = QMap<QString, QVariant>; +using QVariantHash = QHash<QString, QVariant>; +using QVariantPair = QPair<QVariant, QVariant>; + QT_END_NAMESPACE #endif // QCONTAINERFWD_H diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h index 2ac6920cc3..cee58a0f2f 100644 --- a/src/corelib/tools/qhash.h +++ b/src/corelib/tools/qhash.h @@ -691,7 +691,7 @@ struct iterator { } // namespace QHashPrivate -template <class Key, class T> +template <typename Key, typename T> class QHash { using Node = QHashPrivate::Node<Key, T>; @@ -1136,7 +1136,7 @@ public: -template <class Key, class T> +template <typename Key, typename T> class QMultiHash { using Node = QHashPrivate::MultiNode<Key, T>; diff --git a/src/gui/kernel/qwindowdefs.h b/src/gui/kernel/qwindowdefs.h index 172cc593d1..1ac245900e 100644 --- a/src/gui/kernel/qwindowdefs.h +++ b/src/gui/kernel/qwindowdefs.h @@ -101,10 +101,7 @@ typedef QT_PREPEND_NAMESPACE(quintptr) WId; QT_BEGIN_NAMESPACE -template<class K, class V> class QHash; typedef QHash<WId, QWidget *> QWidgetMapper; - -template<class V> class QSet; typedef QSet<QWidget *> QWidgetSet; QT_END_NAMESPACE |