Changeset 605 for trunk/src/gui/kernel/qwindowdefs_pm.h

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/qwindowdefs_pm.h (modified) (1 diff)

trunk/src/gui/kernel/qwindowdefs_pm.h

@@ -86 +86 @@
 Q_GUI_EXPORT int qt_display_height();
 
-Q_GUI_EXPORT QWidget *qWidgetFromHWND(HWND hwnd);
+Q_GUI_EXPORT QWidget *qt_widget_from_hwnd(HWND hwnd);
 
-// For printing non-quoted QString's with QDebug
-struct Q_CORE_EXPORT QDbgStr: public QString
-{
-    inline QDbgStr(const QString &str) : QString(str) {}
-};
+// QDebug helpers for debugging various API types
 
-Q_GUI_EXPORT QDbgStr qWidgetName(QWidget *w);
-inline QDbgStr qWidgetName(HWND hwnd)
-{ return qWidgetName(qWidgetFromHWND(hwnd)); }
+// don't drag qdebug.h but require it to be included first
+#if defined(QDEBUG_H) && !defined(QT_NO_DEBUG_STREAM)
 
-Q_CORE_EXPORT QDbgStr qStrHWND(HWND hwnd);
-Q_CORE_EXPORT QDbgStr qStrHPS(HPS hps);
-Q_CORE_EXPORT QDbgStr qStrHPOINTER(HPOINTER hptr);
-Q_CORE_EXPORT QDbgStr qStrHRGN(HRGN hrgn);
-
-Q_CORE_EXPORT QDbgStr qStrQMSG(const QMSG &qmsg);
+struct QDebugHWND { HWND hwnd; };
+inline QDebugHWND qDebugHWND(HWND hwnd) { QDebugHWND d = { hwnd }; return d; }
+QDebug operator<<(QDebug debug, const QDebugHWND &d);
 
 // the following declarations require OS/2 types not defined here,
-// we don't drag them in but require qt_os2.h to be included before
+// don't drag them in as well but require qt_os2.h to be included first
 #if defined(QT_OS2_H)
 
-Q_CORE_EXPORT QDbgStr qStrRECTL(const RECTL &rcl);
-Q_CORE_EXPORT QDbgStr qStrSWP(const SWP &swp);
-
-#endif // defined(QT_OS2_H)
-
-// don't drag qdebug.h as well but require it to be included before
-#if defined(QDEBUG_H) && !defined(QT_NO_DEBUG_STREAM)
-
-// Prints a non-quoted QString
-inline QDebug operator<<(QDebug dbg, const QDbgStr &str)
-{ dbg << str.toUtf8().constData(); return dbg; }
-
-#if defined(QT_OS2_H)
-
-inline QDebug operator<<(QDebug dbg, const RECTL &rcl)
-{ dbg << qStrRECTL(rcl); return dbg; }
-
-inline QDebug operator<<(QDebug dbg, const SWP &swp)
-{ dbg << qStrSWP(swp); return dbg; }
+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)