Windows QPA plugin: Fix debug formatting.

- Introduce QDebugStateSaver for all debug operators.
- Remove the "Flags=" from enumerations since their type is now output
  by default.
- Added some spaces since the previous formatting relied on space=true
  as a result of some debug operators erroneously returning debug.space(),
  which is now fixed in qtbase.
- Fixed formatting, added noquote() where necessary, added some newlines,
  used stream modifiers instead of QString::number(n, 16) to output
  hex numbers.
- Fix indentation.

Change-Id: I64123a4262916e21448cda2aa61ae1100f07291a
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

1 files changed, 13 insertions, 11 deletions

diff --git a/src/plugins/platforms/windows/qwindowsscreen.cpp b/src/plugins/platforms/windows/qwindowsscreen.cpp
index 28e2aadf14..7756c77001 100644
--- a/src/plugins/platforms/windows/qwindowsscreen.cpp
+++ b/src/plugins/platforms/windows/qwindowsscreen.cpp
@@ -173,20 +173,22 @@ static inline WindowsScreenDataList monitorData()
 
 static QDebug operator<<(QDebug dbg, const QWindowsScreenData &d)
 {
-    QDebug nospace =  dbg.nospace();
-    nospace << "Screen " << d.name << ' '
-            << d.geometry.width() << 'x' << d.geometry.height() << '+' << d.geometry.x() << '+' << d.geometry.y()
-            << " avail: "
-            << d.availableGeometry.width() << 'x' << d.availableGeometry.height() << '+' << d.availableGeometry.x() << '+' << d.availableGeometry.y()
-            << " physical: " << d.physicalSizeMM.width() <<  'x' << d.physicalSizeMM.height()
-            << " DPI: " << d.dpi.first << 'x' << d.dpi.second << " Depth: " << d.depth
-            << " Format: " << d.format;
+    QDebugStateSaver saver(dbg);
+    dbg.nospace();
+    dbg.noquote();
+    dbg << "Screen \"" << d.name << "\" "
+        << d.geometry.width() << 'x' << d.geometry.height() << '+' << d.geometry.x() << '+' << d.geometry.y()
+        << " avail: "
+        << d.availableGeometry.width() << 'x' << d.availableGeometry.height() << '+' << d.availableGeometry.x() << '+' << d.availableGeometry.y()
+        << " physical: " << d.physicalSizeMM.width() << 'x' << d.physicalSizeMM.height()
+        << " DPI: " << d.dpi.first << 'x' << d.dpi.second << " Depth: " << d.depth
+        << " Format: " << d.format;
     if (d.flags & QWindowsScreenData::PrimaryScreen)
-        nospace << " primary";
+        dbg << " primary";
     if (d.flags & QWindowsScreenData::VirtualDesktop)
-        nospace << " virtual desktop";
+        dbg << " virtual desktop";
     if (d.flags & QWindowsScreenData::LockScreen)
-        nospace << " lock screen";
+        dbg << " lock screen";
     return dbg;
 }