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/tools/qcontainerfwd.h | |
| 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/tools/qcontainerfwd.h')
| -rw-r--r-- | src/corelib/tools/qcontainerfwd.h | 25 |
1 files changed, 15 insertions, 10 deletions
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 |