diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2011-10-14 09:22:46 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-09 10:11:02 +0100 |
| commit | 7f35d5849e7233efac16c12271c58a049923b1c0 (patch) | |
| tree | 359c3dbef0395a6643c8cb346796e9c6fea31d3f /src/corelib/kernel/qvariant.h | |
| parent | 7ae1e3945507bcaab5bd4ed7a3911fcfa889327a (diff) | |
Refactor QMetaType types.
QMetaType::Type enum is the main source of type ids. Currently
there are many tasks that can be replaced by a smart macro that
can iterate over all types. The patch introduces series of FOR_EACH_
macros that may be used for code generation.
As the first step the macro was used for Q_DECLARE_BUILTIN_METATYPE
to make sure that no type was forgotten.
Second step was to use created macros in autotest to improve tests
coverage.
Change-Id: I34e9ad7bacf02b44b028bc1aad20b1241aacebd3
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/kernel/qvariant.h')
| -rw-r--r-- | src/corelib/kernel/qvariant.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 61dc48ad94..fbf5a84d3e 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -392,10 +392,6 @@ public: inline DataPtr &data_ptr() { return d; } }; -typedef QList<QVariant> QVariantList; -typedef QMap<QString, QVariant> QVariantMap; -typedef QHash<QString, QVariant> QVariantHash; - inline bool qvariant_cast_helper(const QVariant &v, QVariant::Type tp, void *ptr) { return QVariant::handler->convert(&v.d, tp, ptr, 0); } @@ -522,10 +518,6 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QVariant::Type); QT_END_NAMESPACE -Q_DECLARE_BUILTIN_METATYPE(QVariantList, QVariantList) -Q_DECLARE_BUILTIN_METATYPE(QVariantMap, QVariantMap) -Q_DECLARE_BUILTIN_METATYPE(QVariantHash, QVariantHash) - QT_END_HEADER #endif // QVARIANT_H |