Changeset 605 for trunk/src/gui/kernel/qwidget_pm.cpp

Timestamp:

Feb 26, 2010, 12:33:58 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Cleaned up debug printing: get rid of qStr*() functions and use cross-platform qDebugFmt*() instead.

File:

• trunk/src/gui/kernel/qwidget_pm.cpp (modified) (19 diffs)

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -150 +150 @@
 {
 #if defined(QT_DEBUGWIDGETMASK)
-    qDebug("qt_WinInvalidateRegionEx: hwnd=%s hwndFrom=%08lX hwndTo=%08lX",
-           qStrHWND(hwnd).toUtf8().constData(), hwndFrom, hwndTo);
+    qDebug() << "qt_WinInvalidateRegionEx: hwnd" << qDebugHWND(hwnd)
+             << "hwndFrom" << qDebugFmtHex(hwndFrom)
+             << "hwndTo" << qDebugFmtHex(hwndTo);
 #endif
 
@@ -179 +180 @@
         WinQueryWindowPos(child, &swp);
 #if defined(QT_DEBUGWIDGETMASK)
-        qDebug(" child=%s [fl=%08lX]", qStrHWND(child).toUtf8().constData(),
-               swp.fl);
+        qDebug() << " child" << qDebugHWND(child) << "fl" << qDebugFmtHex(swp.fl);
 #endif
         // proceed only if not hidden
@@ -264 +264 @@
 
 #if defined(QT_DEBUGWIDGETMASK)
-    qDebug("qt_WinProcessWindowObstacles: hwnd=%s, prcl=%p "
-           "hrgn=%08lX, op=%ld flags=%08lX",
-           qStrHWND(hwnd).toUtf8().constData(), prcl, hrgn, op, flags);
+    qDebug() << "qt_WinProcessWindowObstacles: hwnd" << qDebugHWND(hwnd)
+             << "prcl" << prcl << "hrgn" << qDebugFmtHex(hrgn)
+             << "op" << op << "flags" << qDebugFmtHex(flags);
 #endif
 
@@ -316 +316 @@
                 WinQueryWindowPos(relative, &swp);
 #if defined(QT_DEBUGWIDGETMASK)
-                qDebug(" child=%s [fl=%08lX]",
-                       qStrHWND(relative).toUtf8().constData(), swp.fl);
+                qDebug() << " child" << qDebugHWND(relative)
+                         << "fl" << qDebugFmtHex(swp.fl);
 #endif
                 // skip if hidden
@@ -356 +356 @@
             WinQueryWindowPos(relative, &swp);
 #if defined(QT_DEBUGWIDGETMASK)
-            qDebug(" sibling=%s [fl=%08lX]",
-                   qStrHWND(relative).toUtf8().constData(), swp.fl);
+            qDebug() << " sibling" << qDebugHWND(relative)
+                     << "fl" << qDebugFmtHex(swp.fl);
 #endif
             // skip if hidden
@@ -406 +406 @@
             WinQueryWindowPos(parent, &swp);
 #if defined(QT_DEBUGWIDGETMASK)
-            qDebug(" parent=%s [fl=%08lX]",
-                   qStrHWND(parent).toUtf8().constData(), swp.fl);
+            qDebug() << " parent" << qDebugHWND(parent)
+                     << "fl" << qDebugFmtHex(swp.fl);
 #endif
             delta.x += swp.x;
@@ -415 +415 @@
                 WinQueryWindowPos(relative, &swp);
 #if defined(QT_DEBUGWIDGETMASK)
-                qDebug(" ancestor=%s [fl=%08lX]",
-                       qStrHWND(relative).toUtf8().constData(), swp.fl);
+                qDebug() << " ancestor" << qDebugHWND(relative)
+                         << "fl" << qDebugFmtHex(swp.fl);
 #endif
                 // skip if hidden
@@ -468 +468 @@
 {
 #if defined(QT_DEBUGWIDGETMASK)
-    qDebug("qt_WinSetWindowPos: hwnd=%s fl=%08lX",
-           qStrHWND(hwnd).toUtf8().constData(), fl);
+    qDebug() << "qt_WinSetWindowPos: hwnd" << qDebugHWND(hwnd)
+             << "fl" << qDebugFmtHex(fl);
 #endif
 
@@ -561 +561 @@
             }
 #if defined(QT_DEBUGWIDGETMASK)
-            qDebug(" moving up? %ld", up);
-            qDebug(" hwndFrom=%s", qStrHWND(hwndFrom).toUtf8().constData());
-            qDebug(" hwndTo=%s", qStrHWND(hwndTo).toUtf8().constData());
+            qDebug() << " moving up?" << up;
+            qDebug() << " hwndFrom" << qDebugHWND(hwndFrom);
+            qDebug() << " hwndTo" << qDebugHWND(hwndTo);
 #endif
 
@@ -576 +576 @@
                     WinQueryWindowPos(sibling, &swp);
 #if defined(QT_DEBUGWIDGETMASK)
-                    qDebug(" sibling=%s [fl=%08lX]",
-                           qStrHWND(sibling).toUtf8().constData(), swp.fl);
+                    qDebug() << " sibling" << qDebugHWND(sibling)
+                             << "fl" << qDebugFmtHex(swp.fl);
 #endif
                     // proceed only if not hidden
@@ -607 +607 @@
                     WinQueryWindowPos(sibling, &swp);
 #if defined(QT_DEBUGWIDGETMASK)
-                    qDebug(" sibling=%s [fl=%08lX]",
-                           qStrHWND(sibling).toUtf8().constData(), swp.fl);
+                    qDebug() << " sibling" << qDebugHWND(sibling)
+                             << "fl" << qDebugFmtHex(swp.fl);
 #endif
                     // proceed only if not hidden
@@ -1138 +1138 @@
             }
 #if defined(QT_DEBUGWINCREATEDESTROY)
-            qDebug("|Creating top level window (frame) [%s]:\n"
-                   "|  owner = %08lX\n"
-                   "|  title = '%s'\n"
-                   "|  style = %08lX\n"
-                   "|  fcFlags = %08lX",
-                   qWidgetName(q).toUtf8().constData(), ownerw,
-                   title.constData(), fStyle, fcFlags);
+            qDebug() <<   "|Creating top level window (frame)" << q
+                     << "\n|  owner" << qDebugFmtHex(ownerw)
+                     << "\n|  title" << title
+                     << "\n|  style" << qDebugFmtHex(fStyle)
+                     << "\n|  fcFlags" << qDebugFmtHex(fcFlags);
 #endif
             fId = WinCreateWindow(HWND_DESKTOP, WC_FRAME, title, fStyle,
@@ -1150 +1148 @@
                                   &fcData, NULL);
 #if defined(QT_DEBUGWINCREATEDESTROY)
-            qDebug("|  hwnd = %08lX", fId);
+            qDebug() << "|  hwnd" << qDebugFmtHex(fId);
 #endif
             if (fId == NULLHANDLE)
@@ -1189 +1187 @@
             // create client window
 #if defined(QT_DEBUGWINCREATEDESTROY)
-            qDebug("|Creating top level window (client) [%s]:\n"
-                   "|  owner & parent = %08lX\n"
-                   "|  class = '%s'\n"
-                   "|  title = '%s'\n"
-                   "|  style = %08lX",
-                   qWidgetName(q).toUtf8().constData(), fId, className.constData(),
-                   title.constData(), style);
+            qDebug() <<   "|Creating top level window (client)" << q
+                     << "\n|  owner & parent" << qDebugFmtHex(fId)
+                     << "\n|  class" << className
+                     << "\n|  title" << title
+                     << "\n|  style" << qDebugFmtHex(style);
 #endif
             // note that we place the client on top (HWND_TOP) to exclude other
@@ -1203 +1199 @@
         } else {
 #if defined(QT_DEBUGWINCREATEDESTROY)
-            qDebug("|Creating top level window (popup) [%s]:\n"
-                   "|  class = '%s'\n"
-                   "|  title = '%s'\n"
-                   "|  style = %08lX",
-                   qWidgetName(q).toUtf8().constData(), className.constData(),
-                   title.constData(), style);
+            qDebug() <<   "|Creating top level window (popup)" << q
+                     << "\n|  class" << className
+                     << "\n|  title" << title
+                     << "\n|  style" << qDebugFmtHex(style);
 #endif
             id = WinCreateWindow(HWND_DESKTOP, className, title, style,
@@ -1214 +1208 @@
         }
 #if defined(QT_DEBUGWINCREATEDESTROY)
-        qDebug("|  hwnd = %08lX", id);
+        qDebug() << "|  hwnd" << qDebugFmtHex(id);
 #endif
         if (id == NULLHANDLE)
@@ -1327 +1321 @@
 
 #if defined(QT_DEBUGWINCREATEDESTROY)
-        qDebug("|Creating child window [%s]:\n"
-               "|  owner & parent = %08lX\n"
-               "|  class = '%s'\n"
-               "|  title = '%s'\n"
-               "|  style = %08lX",
-               qWidgetName(q).toUtf8().constData(), parentw, className.constData(),
-               title.constData(), style);
+        qDebug() <<   "|Creating child window" << q
+                 << "/n|  owner & parent" << qDebugFmtHex(parentw)
+                 << "/n|  class" << className
+                 << "/n|  title" << title
+                 << "/n|  style" << qDebugFmtHex(style);
 #endif
         id = WinCreateWindow(parentw, className, title, style,
@@ -1342 +1334 @@
                              parentw, HWND_TOP, 0, NULL, NULL);
 #if defined(QT_DEBUGWINCREATEDESTROY)
-        qDebug("|  hwnd = %08lX", id);
+        qDebug() << "|  hwnd" << qDebugFmtHex(id);
 #endif
         if (id == NULLHANDLE)
@@ -1405 +1397 @@
             }
 #if defined(QT_DEBUGWINCREATEDESTROY)
-            qDebug("|Destroying window [%s]:\n"
-                   "|  hwnd = %08lX", qWidgetName(this).toUtf8().constData(), id);
-#endif
-
+            qDebug() << "|Destroying window" << this
+                     << "\n|  hwnd"  << qDebugFmtHex(id);
+#endif
             qt_WinDestroyWindow(id);
         }