Diaglib: Improve formatting of DebugProxyStyle

The class used the default debug operator for QObject, which outputs
the object's address. This makes it hard to compare the log output.

Make the existing QObject formatting helper from the EventFilter
publicly usable by providing a helper with a stream operator.

Change-Id: Ifab83e23cc792a5efe231fd9ae84e0439ab0d609
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
 
 
 
 

1 files changed, 15 insertions, 17 deletions

diff --git a/tests/manual/diaglib/eventfilter.cpp b/tests/manual/diaglib/eventfilter.cpp
index 0646964b4a..39898f0781 100644
--- a/tests/manual/diaglib/eventfilter.cpp
+++ b/tests/manual/diaglib/eventfilter.cpp
@@ -154,7 +154,7 @@ static inline bool matchesType(const QObject *o, EventFilter::ObjectTypes types)
     return types & EventFilter::OtherType;
 }
 
-static void formatObject(const QObject *o, QDebug debug)
+void EventFilter::formatObject(const QObject *o, QDebug debug)
 {
     if (o) {
         debug << o->metaObject()->className();
@@ -166,32 +166,30 @@ static void formatObject(const QObject *o, QDebug debug)
     }
 }
 
+QDebug operator<<(QDebug d, const formatQObject &fo)
+{
+    EventFilter::formatObject(fo.m_object, d);
+    return d;
+}
+
 static void formatApplicationState(QDebug debug)
 {
 #if defined(HAVE_APPLICATION)
-    if (const QWidget *mw = QApplication::activeModalWidget()) {
-        debug << "\n  QApplication::activeModalWidget = ";
-        formatObject(mw, debug);
-    }
-    if (const QWidget *pw = QApplication::activePopupWidget()) {
-        debug << "\n  QApplication::activePopupWidget = ";
-        formatObject(pw, debug);
-    }
-    debug << "\n  QApplication::activeWindow      = ";
-    formatObject(QApplication::activeWindow(), debug);
+    if (const QWidget *mw = QApplication::activeModalWidget())
+        debug << "\n  QApplication::activeModalWidget = " << formatQObject(mw);
+    if (const QWidget *pw = QApplication::activePopupWidget())
+        debug << "\n  QApplication::activePopupWidget = " << formatQObject(pw);
+    debug << "\n  QApplication::activeWindow      = " << formatQObject(QApplication::activeWindow());
 #endif // HAVE_APPLICATION
 #if defined(HAVE_GUI_APPLICATION)
     if (const QWindow *mw = QGuiApplication::modalWindow()) {
-        debug << "\n  QGuiApplication::modalWindow    = ";
-        formatObject(mw, debug);
+        debug << "\n  QGuiApplication::modalWindow    = " << formatQObject(mw);
     }
     const QObject *focusObject = QGuiApplication::focusObject();
     const QObject *focusWindow = QGuiApplication::focusWindow();
-    debug << "\n  QGuiApplication::focusObject    = ";
-    formatObject(focusObject, debug);
+    debug << "\n  QGuiApplication::focusObject    = " << formatQObject(focusObject);
     if (focusWindow && focusWindow != focusObject)
-        debug << "\n  QGuiApplication::focusWindow    = ";
-    formatObject(focusWindow, debug);
+        debug << "\n  QGuiApplication::focusWindow    = " << formatQObject(focusWindow);
 #endif // HAVE_GUI_APPLICATION
 }