Changeset 699 for trunk/src

Timestamp:

Mar 18, 2010, 3:42:18 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: QProcess: Simplified debug output.

File:

• trunk/src/corelib/io/qprocess_os2.cpp (modified) (36 diffs)

trunk/src/corelib/io/qprocess_os2.cpp

@@ -43 +43 @@
 
 //#define QPROCESS_DEBUG
-#include "qdebug.h"
 
 #if defined(__INNOTEK_LIBC__)
@@ -52 +51 @@
 
 #if defined QPROCESS_DEBUG
+
 #include "qstring.h"
 #include <ctype.h>
@@ -86 +86 @@
     return out;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QT_END_NAMESPACE
+
+
+
+
 #endif
 
@@ -246 +265 @@
 USHORT QProcessManager::addProcess(QProcess *process)
 {
-#if defined (QPROCESS_DEBUG)
-    qDebug("QProcessManager::addProcess(%p)", process);
-#endif
+    DEBUG(("QProcessManager::addProcess(%p)", process));
 
     QMutexLocker locker(&mutex);
@@ -317 +334 @@
     QProcess *process = instance->processes[procKey];
 
-#if defined (QPROCESS_DEBUG)
-    qDebug("QProcessManager::removeProcess(%p)", process);
-#endif
+    DEBUG(("QProcessManager::removeProcess(%p)", process));
 
     // to guarantee that the given procKey may be reused, we must close all
@@ -339 +354 @@
     : refcnt(0), finish(false), eventSem(NULLHANDLE), sa_old_sigchld_handler(0)
 {
-#if defined (QPROCESS_DEBUG)
-    qDebug() << "QProcessManager::QProcessManager()";
-#endif
+    DEBUG(() << "QProcessManager::QProcessManager()");
 
     APIRET rc = DosCreateEventSem(NULL, &eventSem,
@@ -354 +367 @@
 QProcessManager::~QProcessManager()
 {
-#if defined (QPROCESS_DEBUG)
-    qDebug() << "QProcessManager::~QProcessManager()";
-#endif
+    DEBUG(() << "QProcessManager::~QProcessManager()");
 
     Q_ASSERT(!refcnt);
@@ -393 +404 @@
 void QProcessManager::run()
 {
-#if defined (QPROCESS_DEBUG)
-    qDebug() << "QProcessManager::run() BEGIN";
-#endif
+    DEBUG(() << "QProcessManager::run() BEGIN");
 
     // Note: the rationale behind using a worker thread so far is that
@@ -419 +428 @@
 
         if (instance->deathFlag.testAndSetRelaxed(1, 0)) {
-#if defined (QPROCESS_DEBUG)
-            qDebug() << "QProcessManager::run(): child death signaled";
-#endif
+            DEBUG(() << "QProcessManager::run(): child death signaled");
             foreach (QProcess *proc, processes) {
                 QProcessPrivate::WaitMode mode = (QProcessPrivate::WaitMode)