diff options
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r-- | src/corelib/kernel/qvariant.cpp | 15 | ||||
-rw-r--r-- | src/corelib/kernel/qvariant.h | 10 |
2 files changed, 0 insertions, 25 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 25b101d5e3..496c318fef 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -1390,13 +1390,8 @@ static void streamDebug(QDebug dbg, const QVariant &v) const QVariant::Handler qt_kernel_variant_handler = { isNull, -#ifndef QT_NO_DATASTREAM - nullptr, - nullptr, -#endif compare, convert, - nullptr, #if !defined(QT_NO_DEBUG_STREAM) streamDebug #else @@ -1412,13 +1407,8 @@ static void dummyStreamDebug(QDebug, const QVariant &) { Q_ASSERT_X(false, "QVar #endif const QVariant::Handler qt_dummy_variant_handler = { dummyIsNull, -#ifndef QT_NO_DATASTREAM - nullptr, - nullptr, -#endif dummyCompare, dummyConvert, - nullptr, #if !defined(QT_NO_DEBUG_STREAM) dummyStreamDebug #else @@ -1516,13 +1506,8 @@ static void customStreamDebug(QDebug dbg, const QVariant &variant) { const QVariant::Handler qt_custom_variant_handler = { customIsNull, -#ifndef QT_NO_DATASTREAM - nullptr, - nullptr, -#endif customCompare, customConvert, - nullptr, #if !defined(QT_NO_DEBUG_STREAM) customStreamDebug #else diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 1f79bdfd89..2f21ef418f 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -448,23 +448,13 @@ class Q_CORE_EXPORT QVariant }; public: typedef bool (*f_null)(const Private *); -#ifndef QT_NO_DATASTREAM - typedef void (*f_load)(Private *, QDataStream &); - typedef void (*f_save)(const Private *, QDataStream &); -#endif typedef bool (*f_compare)(const Private *, const Private *); 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_null isNull; -#ifndef QT_NO_DATASTREAM - f_load load; - f_save save; -#endif f_compare compare; f_convert convert; - f_canConvert canConvert; f_debugStream debugStream; }; |