Changeset 1006

Timestamp:

Aug 19, 2011, 12:27:58 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Export platform-specific qDebug() helpers.

This lets them be used in application code.

Location:

trunk/src/gui/kernel

Files:

• qapplication_pm.cpp (modified) (4 diffs)
• qwindowdefs_pm.h (modified) (2 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -2639 +2639 @@
  *****************************************************************************/
 
-QDebug operator<<(QDebug debug, const QDebugHWND &d)
-{
-    debug << qDebugFmtHex(d.hwnd) << qt_widget_from_hwnd(d.hwnd);
+Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QDebugHWND &d)
+{
+    QETWidget *w = (QETWidget *)qt_widget_from_hwnd(d.hwnd);
+    debug << qDebugFmtHex(d.hwnd) << w;
+    if (w && w->internalWinId() != w->frameWinId()) {
+        if (w->internalWinId() == d.hwnd)
+            debug.nospace() << "(frame " << qDebugFmtHex(w->frameWinId()) << ")";
+        else if (w->frameWinId() == d.hwnd)
+            debug.nospace() << "(client " << qDebugFmtHex(w->internalWinId()) << ")";
+    }
     return debug;
 }
 
-QDebug operator<<(QDebug debug, const QDebugHRGN &d)
+QDebug operator<<(QDebug debug, const QDebugHRGN &d)
 {
     RGNRECT ctl;
@@ -2666 +2673 @@
 }
 
-QDebug operator<<(QDebug debug, const RECTL &rcl)
+QDebug operator<<(QDebug debug, const RECTL &rcl)
 {
     debug.nospace() << "RECTL(" << rcl.xLeft << "," << rcl.yBottom
@@ -2680 +2687 @@
 #define myDefFlagCut(var,fl,varstr,pos) myDefFlagEx(var,fl,varstr,#fl + pos)
 
-QDebug operator<<(QDebug debug, const SWP &swp)
+QDebug operator<<(QDebug debug, const SWP &swp)
 {
     QByteArray fl;
@@ -2707 +2714 @@
 }
 
-QDebug operator<<(QDebug debug, const QMSG &qmsg)
+QDebug operator<<(QDebug debug, const QMSG &qmsg)
 {
     #define myCaseBegin(a) case a: { \

trunk/src/gui/kernel/qwindowdefs_pm.h

@@ -111 +111 @@
 struct QDebugHWND { HWND hwnd; };
 inline QDebugHWND qDebugHWND(HWND hwnd) { QDebugHWND d = { hwnd }; return d; }
-QDebug operator<<(QDebug debug, const QDebugHWND &d);
+QDebug operator<<(QDebug debug, const QDebugHWND &d);
 
 struct QDebugHRGN { HRGN hrgn; };
 inline QDebugHRGN qDebugHRGN(HRGN hrgn) { QDebugHRGN d = { hrgn }; return d; }
-QDebug operator<<(QDebug debug, const QDebugHRGN &d);
+QDebug operator<<(QDebug debug, const QDebugHRGN &d);
 
 // the following declarations require OS/2 types not defined here,
@@ -121 +121 @@
 #if defined(QT_OS2_H)
 
-QDebug operator<<(QDebug debug, const RECTL &rcl);
-QDebug operator<<(QDebug debug, const SWP &swp);
-QDebug operator<<(QDebug debug, const QMSG &qmsg);
+QDebug operator<<(QDebug debug, const RECTL &rcl);
+QDebug operator<<(QDebug debug, const SWP &swp);
+QDebug operator<<(QDebug debug, const QMSG &qmsg);
 
 #endif // defined(QT_OS2_H)