diff options
author | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2012-02-10 12:21:25 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-27 12:47:52 +0100 |
commit | 51f2a0c3318549a6f9388e3d4920eb23a60f8b7b (patch) | |
tree | f25f66a07b4d4320978909aa069c5251d11145ca /src/corelib/kernel/qvariant.h | |
parent | 1a49a529ee3e721ea8736bd0c34a0086a2dbad4d (diff) |
Cleanup usage of QVariant::Type.
QVariant::Type is marked as obsolete. It is not possible to get rid of
it completely, in a source compatible way, but at least we can remove it
safely from a method arguments list.
Change-Id: I26b58099bfa6d32f3a583a8ae0047f0bb36bcd0d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qvariant.h')
-rw-r--r-- | src/corelib/kernel/qvariant.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 20d3946ea1..5da482d5cd 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -194,8 +194,8 @@ class Q_CORE_EXPORT QVariant inline QVariant(); ~QVariant(); QVariant(Type type); - QVariant(int typeOrUserType, const void *copy); - QVariant(int typeOrUserType, const void *copy, uint flags); + QVariant(int typeId, const void *copy); + QVariant(int typeId, const void *copy, uint flags); QVariant(const QVariant &other); #ifndef QT_NO_DATASTREAM @@ -257,8 +257,8 @@ class Q_CORE_EXPORT QVariant int userType() const; const char *typeName() const; - bool canConvert(Type t) const; - bool convert(Type t); + bool canConvert(int targetTypeId) const; + bool convert(int targetTypeId); inline bool isValid() const; bool isNull() const; @@ -311,7 +311,7 @@ class Q_CORE_EXPORT QVariant void load(QDataStream &ds); void save(QDataStream &ds) const; #endif - static const char *typeToName(Type type); + static const char *typeToName(int typeId); static Type nameToType(const char *name); void *data(); @@ -331,7 +331,7 @@ class Q_CORE_EXPORT QVariant template<typename T> bool canConvert() const - { return canConvert(Type(qMetaTypeId<T>())); } + { return canConvert(qMetaTypeId<T>()); } public: #ifndef qdoc @@ -381,8 +381,8 @@ class Q_CORE_EXPORT QVariant typedef void (*f_save)(const Private *, QDataStream &); #endif typedef bool (*f_compare)(const Private *, const Private *); - typedef bool (*f_convert)(const QVariant::Private *d, Type t, void *, bool *); - typedef bool (*f_canConvert)(const QVariant::Private *d, Type t); + typedef bool (*f_convert)(const QVariant::Private *d, int t, void *, bool *); + typedef bool (*f_canConvert)(const QVariant::Private *d, int t); typedef void (*f_debugStream)(QDebug, const QVariant &); struct Handler { f_construct construct; @@ -527,7 +527,7 @@ namespace QtPrivate { return *reinterpret_cast<const T *>(v.constData()); if (vid < int(QMetaType::User)) { T t; - if (v.convert(QVariant::Type(vid), &t)) + if (v.convert(vid, &t)) return t; } return T(); |