Changeset 72 for trunk/src/corelib/io/qprocess_p.h

Timestamp:

Jul 9, 2009, 1:43:12 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: OS/2: Reimplemented QProcess using libc pipes (#7).

File:

• trunk/src/corelib/io/qprocess_p.h (modified) (6 diffs)

trunk/src/corelib/io/qprocess_p.h ¶

@@ -59 +59 @@
 #include "private/qiodevice_p.h"
 
-#if defined(Q_OS_WIN)
+#ifdef Q_OS_WIN
 #include "QtCore/qt_windows.h"
 typedef HANDLE Q_PIPE;
 #define INVALID_Q_PIPE INVALID_HANDLE_VALUE
-#elif defined(Q_OS_OS2)
-#include "QtCore/qt_os2.h"
-#define HP_NULL HPIPE(~0)
-#define HF_NULL HFILE(~0)
 #else
 typedef int Q_PIPE;
@@ -97 +93 @@
         Channel() : process(0), notifier(0), type(Normal), closed(false), append(false)
         {
-#if !defined(Q_OS_OS2)
             pipe[0] = INVALID_Q_PIPE;
             pipe[1] = INVALID_Q_PIPE;
-#else
-            pipe = HP_NULL;
-            file = HF_NULL;
-#endif
         }
 
@@ -132 +123 @@
         QString file;
         QProcessPrivate *process;
-#if !defined(Q_OS_OS2)
         QSocketNotifier *notifier;
         Q_PIPE pipe[2];
-#else
-        HPIPE pipe;
-        HFILE file;
-#endif
 
         unsigned type : 2;
@@ -182 +168 @@
     QRingBuffer writeBuffer;
 
-#if !defined(Q_OS_OS2)
     Q_PIPE childStartedPipe[2];
     Q_PIPE deathPipe[2];
@@ -194 +179 @@
     QWindowsPipeWriter *pipeWriter;
     QWinEventNotifier *processFinishedNotifier;
-#else
-    void destroyPipe(Channel &channel);
-#endif
 
     void startProcess();
@@ -206 +188 @@
     void killProcess();
     void findExitCode();
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
     bool waitForDeadChild();
 #endif