[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/qca/plugins/qca-gnupg/gpgproc
From:       Justin Karneges <infiniti () affinix ! com>
Date:       2007-08-20 17:35:27
Message-ID: 1187631327.505942.18215.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 702479 by infiniti:

use signal relay on all platforms


 M  +6 -4      gpgproc.cpp  


--- trunk/kdesupport/qca/plugins/qca-gnupg/gpgproc/gpgproc.cpp #702478:702479
@@ -25,6 +25,8 @@
 #define QT_PIPE_HACK
 #endif
 
+#define QPROC_SIGNAL_RELAY
+
 using namespace QCA;
 
 namespace gpgQCAPlugin {
@@ -104,7 +106,7 @@
 	QStringList args;
 	GPGProc::Mode mode;
 	SProcess *proc;
-#ifdef QT_PIPE_HACK
+#ifdef QPROC_SIGNAL_RELAY
 	QProcessSignalRelay *proc_relay;
 #endif
 	QPipe pipeAux, pipeCommand, pipeStatus;
@@ -131,7 +133,7 @@
 		qRegisterMetaType<gpgQCAPlugin::GPGProc::Error>("gpgQCAPlugin::GPGProc::Error");
 
 		proc = 0;
-#ifdef QT_PIPE_HACK
+#ifdef QPROC_SIGNAL_RELAY
 		proc_relay = 0;
 #endif
 		startTrigger.setSingleShot(true);
@@ -179,7 +181,7 @@
 			if(proc->state() != QProcess::NotRunning)
 				proc->terminate();
 			proc->setParent(0);
-#ifdef QT_PIPE_HACK
+#ifdef QPROC_SIGNAL_RELAY
 			delete proc_relay;
 			proc_relay = 0;
 			delete proc; // should be safe to do thanks to relay
@@ -619,7 +621,7 @@
 	if(d->pipeStatus.readEnd().isValid())
 		d->pipeStatus.readEnd().enable();
 
-#ifdef QT_PIPE_HACK
+#ifdef QPROC_SIGNAL_RELAY
 	d->proc_relay = new QProcessSignalRelay(d->proc, d);
 	connect(d->proc_relay, SIGNAL(started()), d, SLOT(proc_started()));
 	connect(d->proc_relay, SIGNAL(readyReadStandardOutput()), d, SLOT(proc_readyReadStandardOutput()));
[prev in list] [next in list] [prev in thread] [next in thread]