Changeset 611 for tests/widget/widget.cpp

Timestamp:

Feb 26, 2010, 7:49:00 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

tests/widget: Cleaned up debugging according to r605 changes and added a simple QProcess test.

File:

• tests/widget/widget.cpp (modified) (21 diffs)

tests/widget/widget.cpp

@@ -3 +3 @@
 #include <QtGui>
 
-#ifndef Q_WS_PM
-
-// For printing non-quoted QString's with QDebug)
-struct QDbgStr: public QString
-{
-    inline QDbgStr(const QString &str) : QString(str) {}
-};
-
-// Prints a non-quoted QString
-inline QDebug operator<<(QDebug dbg, const QDbgStr &str)
-{ dbg << str.toUtf8().constData(); return dbg; }
-
-QDbgStr qWidgetName(QWidget *w)
-{
-    if (w)
-        return QString()
-            .sprintf("%s.%s", w->metaObject()->className(),
-                     w->objectName().isEmpty() ? "<noname>" :
-                     w->objectName().toUtf8().constData());
-    return QString(QLatin1String("<no-widget>"));
-}
-
-#endif
-
 #define myDefFlagEx(var,fl,varstr,flstr) if (var & fl) { \
-    if (!varstr.isEmpty()) varstr += QLatin1String("|"); varstr += QLatin1String(flstr); \
+    if (!varstr.isEmpty()) varstr += ; \
 } else do {} while(0)
 
@@ -38 +14 @@
 QDebug operator<<(QDebug dbg, Qt::WindowStates st)
 {
-    QString name;
+    Q name;
     myDefFlagEx(st, Qt::WindowMinimized, name, "Min");
     myDefFlagEx(st, Qt::WindowMaximized, name, "Max");
     myDefFlagEx(st, Qt::WindowFullScreen, name, "Full");
     myDefFlagEx(st, Qt::WindowActive, name, "Act");
-    if (name.isEmpty()) name = QLatin1String("None");
-    dbg.nospace() << "WindowState(" << QDbgStr(name) << ")";
+    if (name.isEmpty()) name = ;
+    dbg.nospace() << "WindowState(" << ) << ")";
     return dbg.space();
 }
@@ -50 +26 @@
 QDebug operator<<(QDebug dbg, Qt::FocusReason r)
 {
-    QString name;
+    Q name;
     if (r == Qt::MouseFocusReason) name = "Mouse";
     if (r == Qt::TabFocusReason) name = "Tab";
@@ -59 +35 @@
     if (r == Qt::MenuBarFocusReason) name = "MenuBar";
     if (r == Qt::OtherFocusReason) name = "Other";
-    dbg.nospace() << "FocusReason(" << QDbgStr(name) << ")";
+    dbg.nospace() << "FocusReason(" << ) << ")";
     return dbg.space();
 }
@@ -80 +56 @@
     void paintEvent(QPaintEvent *aE)
     {
-        qDebug() << qWidgetName(this) << __FUNCTION__
+        qDebug() <<  << __FUNCTION__
                  << ": " << aE->rect() << "focus" << hasFocus();
 
@@ -108 +84 @@
     void focusInEvent(QFocusEvent *aE)
     {
-        qDebug() << qWidgetName(this) << __FUNCTION__ << ": reason" << aE->reason();
+        qDebug() <<  << __FUNCTION__ << ": reason" << aE->reason();
         QWidget::focusInEvent(aE);
     }
@@ -114 +90 @@
     void focusOutEvent(QFocusEvent *aE)
     {
-        qDebug() << qWidgetName(this) << __FUNCTION__ << ": reason" << aE->reason();
+        qDebug() <<  << __FUNCTION__ << ": reason" << aE->reason();
         QWidget::focusOutEvent(aE);
     }
@@ -140 +116 @@
     void focusInEvent(QFocusEvent *aE)
     {
-        qDebug() << qWidgetName(this) << __FUNCTION__ << ":" << text()
+        qDebug() <<  << __FUNCTION__ << ":" << text()
                  << "reason" << aE->reason()
-                 << "focus" << (qApp->focusWidget() ?
-                    qWidgetName(qApp->focusWidget()) : QDbgStr(QLatin1String("<none>")));
+                 << "focus" << qApp->focusWidget();
 
         QPushButton::focusInEvent(aE);
@@ -150 +125 @@
     void focusOutEvent(QFocusEvent *aE)
     {
-        qDebug() << qWidgetName(this) << __FUNCTION__ << ":" << text()
+        qDebug() <<  << __FUNCTION__ << ":" << text()
                  << "reason" << aE->reason()
-                 << "focus" << (qApp->focusWidget() ?
-                    qWidgetName(qApp->focusWidget()) : QDbgStr(QLatin1String("<none>")));
+                 << "focus" << qApp->focusWidget();
         QPushButton::focusOutEvent(aE);
     }
@@ -171 +145 @@
     void focusInEvent(QFocusEvent *aE)
     {
-        qDebug() << qWidgetName(this) << __FUNCTION__ << ":" << currentText()
+        qDebug() <<  << __FUNCTION__ << ":" << currentText()
                  << "reason" << aE->reason()
-                 << "focus" << (qApp->focusWidget() ?
-                    qWidgetName(qApp->focusWidget()) : QDbgStr(QLatin1String("<none>")));
+                 << "focus" << qApp->focusWidget();
         QComboBox::focusInEvent(aE);
     }
@@ -180 +153 @@
     void focusOutEvent(QFocusEvent *aE)
     {
-        qDebug() << qWidgetName(this) << __FUNCTION__ << ":" << currentText()
+        qDebug() <<  << __FUNCTION__ << ":" << currentText()
                  << "reason" << aE->reason()
-                 << "focus" << (qApp->focusWidget() ?
-                    qWidgetName(qApp->focusWidget()) : QDbgStr(QLatin1String("<none>")));
+                 << "focus" << qApp->focusWidget();
         QComboBox::focusOutEvent(aE);
     }
@@ -218 +190 @@
     {
         qDebug() << __FUNCTION__ << ": btn" << aE->button()
-                 << QDbgStr(QString().sprintf("btns %08X mods %08X",
-                                              (int) aE->buttons(), (int) aE->modifiers()))
+                 << 
+                 ))
                  << "gpos" << aE->globalPos() << "pos" << aE->pos();
         QComboBox::mousePressEvent(aE);
@@ -227 +199 @@
     {
         qDebug() << __FUNCTION__ << ": btn" << aE->button()
-                 << QDbgStr(QString().sprintf("btns %08X mods %08X",
-                                              (int) aE->buttons(), (int) aE->modifiers()))
+                 << 
+                 ))
                  << "gpos" << aE->globalPos() << "pos" << aE->pos();
         QComboBox::mouseReleaseEvent(aE);
@@ -371 +343 @@
     void focusInEvent(QFocusEvent *aE)
     {
-        qDebug() << qWidgetName(this) << __FUNCTION__ << ": reason" << aE->reason();
+        qDebug() <<  << __FUNCTION__ << ": reason" << aE->reason();
         QWidget::focusInEvent(aE);
     }
@@ -377 +349 @@
     void focusOutEvent(QFocusEvent *aE)
     {
-        qDebug() << qWidgetName(this) << __FUNCTION__ << ": reason" << aE->reason();
+        qDebug() <<  << __FUNCTION__ << ": reason" << aE->reason();
         QWidget::focusOutEvent(aE);
     }
@@ -401 +373 @@
     void keyPressEvent(QKeyEvent *aE)
     {
-        qDebug() << __FUNCTION__ << "  : cnt" << aE->count()
-                 << "rep" << aE->isAutoRepeat()
-                 << QDbgStr(QString().sprintf("key %08X mods %08X", aE->key(), (int) aE->modifiers()))
-                 << "text" << aE->text()
-                 << QDbgStr(aE->text().isEmpty() ? QString() :
-                            QString().sprintf("(%04X)", aE->text()[0].unicode()));
-    }
-
-    void keyReleaseEvent(QKeyEvent *aE)
-    {
         qDebug() << __FUNCTION__ << ": cnt" << aE->count()
                  << "rep" << aE->isAutoRepeat()
-                 << QDbgStr(QString().sprintf("key %08X mods %08X", aE->key(), (int) aE->modifiers()))
+                 << "key" << qDebugFmtHex(aE->key())
+                 << "mods" << qDebugFmtHex(aE->modifiers())
                  << "text" << aE->text()
-                 << QDbgStr(aE->text().isEmpty() ? QString() :
-                            QString().sprintf("(%04X)", aE->text()[0].unicode()));
+                 << qDebugFmtHex((aE->text().isEmpty() ? 0 :
+                                  aE->text()[0].unicode()));
+    }
+
+    void keyReleaseEvent(QKeyEvent *aE)
+    {
+        qDebug() << __FUNCTION__ << ": cnt" << aE->count()
+                 << "rep" << aE->isAutoRepeat()
+                 << "key" << qDebugFmtHex(aE->key())
+                 << "mods" << qDebugFmtHex(aE->modifiers())
+                 << "text" << aE->text()
+                 << qDebugFmtHex((aE->text().isEmpty() ? 0 :
+                                  aE->text()[0].unicode()));
     }
 #endif
@@ -438 +412 @@
     {
         qDebug() << __FUNCTION__ << ": btn" << aE->button()
-                 << QDbgStr(QString().sprintf("btns %08X mods %08X",
-                                              (int) aE->buttons(), (int) aE->modifiers()))
+                 << 
+                 ))
                  << "gpos" << aE->globalPos() << "pos" << aE->pos();
 
@@ -449 +423 @@
     {
         qDebug() << __FUNCTION__ << ": btn" << aE->button()
-                 << QDbgStr(QString().sprintf("btns %08X mods %08X",
-                                              (int) aE->buttons(), (int) aE->modifiers()))
+                 << 
+                 ))
                  << "gpos" << aE->globalPos() << "pos" << aE->pos();
     }
@@ -457 +431 @@
     {
         qDebug() << __FUNCTION__ << ": btn" << aE->button()
-                 << QDbgStr(QString().sprintf("btns %08X mods %08X",
-                                              (int) aE->buttons(), (int) aE->modifiers()))
+                 << 
+                 ))
                  << "gpos" << aE->globalPos() << "pos" << aE->pos();
     }
@@ -509 +483 @@
             QMouseEvent *me = static_cast<QMouseEvent*>(aE);
             qDebug() << this << aE->type() << ": btn" << me->button()
-                     << QDbgStr(QString().sprintf("btns %08X mods %08X",
-                                                  (int) me->buttons(), (int) me->modifiers()))
+                     << 
+                     ))
                      << "gpos" << me->globalPos() << "pos" << me->pos();
             break;
@@ -568 +542 @@
 
 #if 1
+
+
+
+
+
+
+
+
+
+
+
+
     //--------------------------------------------------------------------------
     // QFileInfo test