1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused function pointers in QVariant::Handler

Browse Source 
Task-number: QTBUG-84635
Change-Id: Icfbd1aae26b0453426d93e0af64d84d6403b8e3b
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
This commit is contained in:
Lars Knoll 2020-06-04 13:21:08 +02:00
parent ccbf6ae0bb
commit 3615a5813a
4 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/corelib/kernel/qvariant.cpp
View File

@ -1390,13 +1390,8 @@ static void streamDebug(QDebug dbg, const QVariant &v)
const QVariant::Handler qt_kernel_variant_handler = { const QVariant::Handler qt_kernel_variant_handler = {
isNull, isNull,
#ifndef QT_NO_DATASTREAM
nullptr,
nullptr,
#endif
compare, compare,
convert, convert,
nullptr,
#if !defined(QT_NO_DEBUG_STREAM) #if !defined(QT_NO_DEBUG_STREAM)
streamDebug streamDebug
#else #else
@ -1412,13 +1407,8 @@ static void dummyStreamDebug(QDebug, const QVariant &) { Q_ASSERT_X(false, "QVar
#endif #endif
const QVariant::Handler qt_dummy_variant_handler = { const QVariant::Handler qt_dummy_variant_handler = {
dummyIsNull, dummyIsNull,
#ifndef QT_NO_DATASTREAM
nullptr,
nullptr,
#endif
dummyCompare, dummyCompare,
dummyConvert, dummyConvert,
nullptr,
#if !defined(QT_NO_DEBUG_STREAM) #if !defined(QT_NO_DEBUG_STREAM)
dummyStreamDebug dummyStreamDebug
#else #else
@ -1516,13 +1506,8 @@ static void customStreamDebug(QDebug dbg, const QVariant &variant) {
const QVariant::Handler qt_custom_variant_handler = { const QVariant::Handler qt_custom_variant_handler = {
customIsNull, customIsNull,
#ifndef QT_NO_DATASTREAM
nullptr,
nullptr,
#endif
customCompare, customCompare,
customConvert, customConvert,
nullptr,
#if !defined(QT_NO_DEBUG_STREAM) #if !defined(QT_NO_DEBUG_STREAM)
customStreamDebug customStreamDebug
#else #else

10
src/corelib/kernel/qvariant.h
View File

@ -448,23 +448,13 @@ class Q_CORE_EXPORT QVariant
}; };
public: public:
typedef bool (*f_null)(const Private *); 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_compare)(const Private *, const Private *);
typedef bool (*f_convert)(const QVariant::Private *d, int t, void *, bool *); 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 &); typedef void (*f_debugStream)(QDebug, const QVariant &);
struct Handler { struct Handler {
f_null isNull; f_null isNull;
#ifndef QT_NO_DATASTREAM
f_load load;
f_save save;
#endif
f_compare compare; f_compare compare;
f_convert convert; f_convert convert;
f_canConvert canConvert;
f_debugStream debugStream; f_debugStream debugStream;
}; };

7
src/gui/kernel/qguivariant.cpp
View File

@ -306,17 +306,12 @@ static void streamDebug(QDebug dbg, const QVariant &v)
const QVariant::Handler qt_gui_variant_handler = { const QVariant::Handler qt_gui_variant_handler = {
isNull, isNull,
#ifndef QT_NO_DATASTREAM
nullptr,
nullptr,
#endif
compare, compare,
convert, convert,
nullptr,
#if !defined(QT_NO_DEBUG_STREAM) #if !defined(QT_NO_DEBUG_STREAM)
streamDebug streamDebug
#else #else
0 nullptr
#endif #endif
}; };

7
src/widgets/kernel/qwidgetsvariant.cpp
View File

@ -92,17 +92,12 @@ static void streamDebug(QDebug dbg, const QVariant &v)
static const QVariant::Handler widgets_handler = { static const QVariant::Handler widgets_handler = {
isNull, isNull,
#ifndef QT_NO_DATASTREAM
nullptr,
nullptr,
#endif
compare, compare,
convert, convert,
nullptr,
#if !defined(QT_NO_DEBUG_STREAM) #if !defined(QT_NO_DEBUG_STREAM)
streamDebug streamDebug
#else #else
0 nullptr
#endif #endif
}; };