diff options
author | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2011-12-05 12:43:10 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-10 09:13:11 +0100 |
commit | f85b9f824269073664770c11f58e674993d33e47 (patch) | |
tree | 289574ece05e87d283bd7b1c96cddfd80869443b /src/widgets/kernel/qwidgetsvariant.cpp | |
parent | 7024ddba4b91d66341e1e076aca90b55aaf6641d (diff) |
Reimplement QVariant to QDebug streaming.
New implementation fixes some commented code marked as FIXME.
Change-Id: If8f5bebedd65bcf8f839d804c2022ca79ef82ddf
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/widgets/kernel/qwidgetsvariant.cpp')
-rw-r--r-- | src/widgets/kernel/qwidgetsvariant.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/widgets/kernel/qwidgetsvariant.cpp b/src/widgets/kernel/qwidgetsvariant.cpp index e33d0da0a1..e9fa99a80e 100644 --- a/src/widgets/kernel/qwidgetsvariant.cpp +++ b/src/widgets/kernel/qwidgetsvariant.cpp @@ -127,6 +127,23 @@ static bool convert(const QVariant::Private *d, QVariant::Type type, void *resul return false; } +static void streamDebug(QDebug dbg, const QVariant &v) +{ + QVariant::Private *d = const_cast<QVariant::Private *>(&v.data_ptr()); + switch (d->type) { +#ifndef QT_NO_ICON + case QVariant::Icon: + dbg.nospace() << *v_cast<QIcon>(d); + break; +#endif + case QVariant::SizePolicy: + dbg.nospace() << *v_cast<QSizePolicy>(d); + break; + default: + dbg.nospace() << "QVariant::Type(" << d->type << ")"; + } +} + static const QVariant::Handler widgets_handler = { construct, clear, @@ -139,7 +156,7 @@ static const QVariant::Handler widgets_handler = { convert, 0, #if !defined(QT_NO_DEBUG_STREAM) && !defined(Q_BROKEN_DEBUG_STREAM) - 0 + streamDebug #else 0 #endif |