From 1480588f44430e6bf005f298f62eafcd234af8da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 13 Jun 2022 12:53:34 +0200 Subject: [PATCH] Print QScreen geometry debug state using the underlying types A QRect is unambiguous, and easier to parse than a custom rect format. Change-Id: If8c197a5e522744b9629d5d89536df5c0da7308c Reviewed-by: Volker Hilsheimer Reviewed-by: Alexandru Croitor --- src/gui/kernel/qscreen.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp index 2b22816e3e6..fd0e2ba2f77 100644 --- a/src/gui/kernel/qscreen.cpp +++ b/src/gui/kernel/qscreen.cpp @@ -779,13 +779,6 @@ void *QScreen::resolveInterface(const char *name, int revision) const } #ifndef QT_NO_DEBUG_STREAM - -static inline void formatRect(QDebug &debug, const QRect r) -{ - debug << r.width() << 'x' << r.height() - << Qt::forcesign << r.x() << r.y() << Qt::noforcesign; -} - Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QScreen *screen) { const QDebugStateSaver saver(debug); @@ -796,10 +789,8 @@ Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QScreen *screen) if (debug.verbosity() > 2) { if (screen == QGuiApplication::primaryScreen()) debug << ", primary"; - debug << ", geometry="; - formatRect(debug, screen->geometry()); - debug << ", available="; - formatRect(debug, screen->availableGeometry()); + debug << ", geometry=" << screen->geometry(); + debug << ", available=" << screen->availableGeometry(); debug << ", logical DPI=" << screen->logicalDotsPerInchX() << ',' << screen->logicalDotsPerInchY() << ", physical DPI=" << screen->physicalDotsPerInchX()