Improve debug formatting of key and mouse events.

Use the debug operator for enums and flags to format keys and
modifiers.

Change-Id: Id748e4b2202797efcbf3a616d111399929ada8b1
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
This commit is contained in:
Friedemann Kleint 2015-03-23 12:26:37 +01:00
parent dec7e3ebb7
commit c6ff750686

View File

@ -3721,8 +3721,8 @@ QDebug operator<<(QDebug dbg, const QEvent *e)
dbg << ", " << button; dbg << ", " << button;
if (buttons && button != buttons) if (buttons && button != buttons)
dbg << ", buttons=" << buttons; dbg << ", buttons=" << buttons;
if (const int mods = int(me->modifiers())) if (me->modifiers())
dbg << ", modifiers=0x" << hex << mods << dec; dbg << ", " << me->modifiers();
dbg << ", localPos=" << me->localPos() << ", screenPos=" << me->screenPos(); dbg << ", localPos=" << me->localPos() << ", screenPos=" << me->screenPos();
if (me->source()) if (me->source())
dbg << ", " << me->source(); dbg << ", " << me->source();
@ -3744,9 +3744,9 @@ QDebug operator<<(QDebug dbg, const QEvent *e)
{ {
const QKeyEvent *ke = static_cast<const QKeyEvent *>(e); const QKeyEvent *ke = static_cast<const QKeyEvent *>(e);
dbg << "QKeyEvent(" << type dbg << "QKeyEvent(" << type
<< ", key=0x" << hex << ke->key() << dec; << ", " << static_cast<Qt::Key>(ke->key());
if (const int mods = ke->modifiers()) if (ke->modifiers())
dbg << ", modifiers=0x" << hex << mods << dec; dbg << ", " << ke->modifiers();
if (!ke->text().isEmpty()) if (!ke->text().isEmpty())
dbg << ", text=" << ke->text(); dbg << ", text=" << ke->text();
if (ke->isAutoRepeat()) if (ke->isAutoRepeat())