From 52c253fa33162c1db2d0cb0916e0de188b9a0aae Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 23 Feb 2012 00:22:59 +0100 Subject: Remove QT_ASCII_CAST_WARN_CONSTRUCTOR GCC version < 3 which it was created for is not supported anymore. Change-Id: I0b4df4c99600cacbaafbf0bc4270cd4978600956 Reviewed-by: Thiago Macieira --- src/corelib/kernel/qvariant.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/kernel/qvariant.h') diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 5fcfe3e696..20d3946ea1 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -210,7 +210,7 @@ class Q_CORE_EXPORT QVariant QVariant(double d); QVariant(float f) { d.is_null = false; d.type = QMetaType::Float; d.data.f = f; } #ifndef QT_NO_CAST_FROM_ASCII - QT_ASCII_CAST_WARN_CONSTRUCTOR QVariant(const char *str); + QT_ASCII_CAST_WARN QVariant(const char *str); #endif QVariant(const QByteArray &bytearray); -- cgit v1.2.3 From 51f2a0c3318549a6f9388e3d4920eb23a60f8b7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Fri, 10 Feb 2012 12:21:25 +0100 Subject: 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 --- src/corelib/kernel/qvariant.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/corelib/kernel/qvariant.h') 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 bool canConvert() const - { return canConvert(Type(qMetaTypeId())); } + { return canConvert(qMetaTypeId()); } 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(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(); -- cgit v1.2.3