From f80d71aceb42b5798e80d95521d9512351d0be75 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 29 Nov 2011 13:25:37 +0100 Subject: Accessible debug stream: don't print details for invalid objects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Print "invalid" instead of the details. Change-Id: I785a896b680fad9e9bb81769d9e3361542fbaafe Reviewed-by: Jan-Arve Sæther --- src/gui/accessible/qaccessible.cpp | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'src/gui/accessible') diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp index 057d97a30b..6553ebb6b1 100644 --- a/src/gui/accessible/qaccessible.cpp +++ b/src/gui/accessible/qaccessible.cpp @@ -1218,18 +1218,22 @@ Q_GUI_EXPORT QDebug operator<<(QDebug d, const QAccessibleInterface *iface) } d.nospace(); d << "QAccessibleInterface(" << hex << (void *) iface << dec; - d << " name=" << iface->text(QAccessible::Name) << " "; - d << "role=" << iface->role() << " "; - if (iface->childCount()) - d << "childc=" << iface->childCount() << " "; - if (iface->object()) { - d << "obj=" << iface->object(); - } - bool invisible = iface->state() & QAccessible::Invisible; - if (invisible) { - d << "invisible"; + if (iface->isValid()) { + d << " name=" << iface->text(QAccessible::Name) << " "; + d << "role=" << iface->role() << " "; + if (iface->childCount()) + d << "childc=" << iface->childCount() << " "; + if (iface->object()) { + d << "obj=" << iface->object(); + } + bool invisible = iface->state() & QAccessible::Invisible; + if (invisible) { + d << "invisible"; + } else { + d << "rect=" << iface->rect(); + } } else { - d << "rect=" << iface->rect(); + d << " invalid"; } d << ")"; return d.space(); -- cgit v1.2.3