Changeset 11 for psi

Timestamp:

09/05/06 01:08:29 (2 years ago)

Author:

dmik

Message:

Tools/GPG: Added OS/2-related defines (experimental, needs testing).

Location:

psi/trunk/src/tools/openpgp

Files:

• gpgop.cpp (modified) (2 diffs)
• gpgproc/gpgproc.cpp (modified) (5 diffs)

psi/trunk/src/tools/openpgp/gpgop.cpp

@@ -540 +540 @@
 QString GpgOp::fixIncomingLines(const QString &str)
 {
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
         QString out;
         for(int n = 0; n < (int)str.length(); ++n) {
@@ -558 +558 @@
 QString GpgOp::fixOutgoingLines(const QString &str)
 {
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
         QString out;
         for(int n = 0; n < (int)str.length(); ++n) {

psi/trunk/src/tools/openpgp/gpgproc/gpgproc.cpp

@@ -11 +11 @@
 #include"qpipe.h"
 
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
+#include<qprocess.h>
 #ifdef Q_WS_WIN
-#include<qprocess.h>
 #include<windows.h>
+#endif
 #else
 #include<unistd.h>
@@ -30 +32 @@
         SafeDelete sd;
 
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
         QProcess *proc;
 #else
@@ -171 +173 @@
         }*/
 
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
         d->proc = new QProcess;
 #else
@@ -214 +216 @@
         d->proc->setArguments(fullargs);
 
-#ifndef Q_WS_WIN
+#if !defined(Q_WS_WIN) && !defined(Q_OS_OS2)
         QValueList<int> plist;
         plist += d->pipeAux.writeEnd().id();
@@ -221 +223 @@
         d->proc->setClosePipeList(plist);
 #endif
+        /// @todo (dmik)
+        //  On Unix, it is done when SProcess is destructed. On OS/2 as well as on
+        //  Win32, SProcess is not used, but we use the same QPipe implelentation
+        //  on OS/2 as Unix does, so we need to use the similar technuque to close
+        //  them... Need to investigate this file (i.e. usage) in detail.
 
         connect(d->proc, SIGNAL(readyReadStdout()), SLOT(proc_readyReadStdout()));