QuasarApp/qca
4
0
Fork 0
mirror of https://github.com/QuasarApp/qca.git synced 2025-04-29 04:54:31 +00:00
Code Issues Projects Releases Wiki Activity

Remove QPROC_SIGNAL_RELAY define

Browse Source 
It was always defined anyway, so makes the code easier to understand
This commit is contained in:
Albert Astals Cid 2020-01-30 16:29:56 +01:00
parent 4c31e0c81f
commit a177dbaae4
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/qca-gnupg/gpgproc/gpgproc.cpp
View File

@ -48,9 +48,7 @@ GPGProc::Private::Private(GPGProc *_q)
qRegisterMetaType<gpgQCAPlugin::GPGProc::Error>("gpgQCAPlugin::GPGProc::Error"); qRegisterMetaType<gpgQCAPlugin::GPGProc::Error>("gpgQCAPlugin::GPGProc::Error");
proc = 0; proc = 0;
#ifdef QPROC_SIGNAL_RELAY
proc_relay = 0; proc_relay = 0;
#endif
startTrigger.setSingleShot(true); startTrigger.setSingleShot(true);
doneTrigger.setSingleShot(true); doneTrigger.setSingleShot(true);
@ -105,13 +103,9 @@ void GPGProc::Private::reset(ResetMode mode)
} }
proc->setParent(0); proc->setParent(0);
#ifdef QPROC_SIGNAL_RELAY
releaseAndDeleteLater(this, proc_relay); releaseAndDeleteLater(this, proc_relay);
proc_relay = 0; proc_relay = 0;
delete proc; // should be safe to do thanks to relay delete proc; // should be safe to do thanks to relay
#else
proc->deleteLater();
#endif
proc = 0; proc = 0;
} }
@ -542,7 +536,6 @@ void GPGProc::start(const QString &bin, const QStringList &args, Mode mode)
if(d->pipeStatus.readEnd().isValid()) if(d->pipeStatus.readEnd().isValid())
d->pipeStatus.readEnd().enable(); d->pipeStatus.readEnd().enable();
#ifdef QPROC_SIGNAL_RELAY
d->proc_relay = new QProcessSignalRelay(d->proc, d); d->proc_relay = new QProcessSignalRelay(d->proc, d);
connect(d->proc_relay, &QProcessSignalRelay::started, d, &GPGProc::Private::proc_started); connect(d->proc_relay, &QProcessSignalRelay::started, d, &GPGProc::Private::proc_started);
connect(d->proc_relay, &QProcessSignalRelay::readyReadStandardOutput, d, &GPGProc::Private::proc_readyReadStandardOutput); connect(d->proc_relay, &QProcessSignalRelay::readyReadStandardOutput, d, &GPGProc::Private::proc_readyReadStandardOutput);
@ -550,14 +543,6 @@ void GPGProc::start(const QString &bin, const QStringList &args, Mode mode)
connect(d->proc_relay, &QProcessSignalRelay::bytesWritten, d, &GPGProc::Private::proc_bytesWritten); connect(d->proc_relay, &QProcessSignalRelay::bytesWritten, d, &GPGProc::Private::proc_bytesWritten);
connect(d->proc_relay, &QProcessSignalRelay::finished, d, &GPGProc::Private::proc_finished); connect(d->proc_relay, &QProcessSignalRelay::finished, d, &GPGProc::Private::proc_finished);
connect(d->proc_relay, &QProcessSignalRelay::error, d, &GPGProc::Private::proc_error); connect(d->proc_relay, &QProcessSignalRelay::error, d, &GPGProc::Private::proc_error);
#else
connect(d->proc, &SProcess::started, d, &GPGProc::Private::proc_started);
connect(d->proc, &SProcess::readyReadStandardOutput, d, &GPGProc::Private::proc_readyReadStandardOutput);
connect(d->proc, &SProcess::readyReadStandardError, d, &GPGProc::Private::proc_readyReadStandardError);
connect(d->proc, &SProcess::bytesWritten, d, &GPGProc::Private::proc_bytesWritten);
connect(d->proc, QOverload<int,QProcess::ExitStatus>::of(&SProcess::finished), d, &GPGProc::Private::proc_finished);
connect(d->proc, &SProcess::errorOccurred, d, &GPGProc::Private::proc_error);
#endif
d->bin = bin; d->bin = bin;
d->args = args; d->args = args;

4
plugins/qca-gnupg/gpgproc/gpgproc_p.h
View File

@ -19,8 +19,6 @@
#pragma once #pragma once
#define QPROC_SIGNAL_RELAY
#include "qpipe.h" #include "qpipe.h"
#include "sprocess.h" #include "sprocess.h"
#include "gpgproc.h" #include "gpgproc.h"
@ -100,9 +98,7 @@ public:
QStringList args; QStringList args;
GPGProc::Mode mode; GPGProc::Mode mode;
SProcess *proc; SProcess *proc;
#ifdef QPROC_SIGNAL_RELAY
QProcessSignalRelay *proc_relay; QProcessSignalRelay *proc_relay;
#endif
QCA::QPipe pipeAux, pipeCommand, pipeStatus; QCA::QPipe pipeAux, pipeCommand, pipeStatus;
QByteArray statusBuf; QByteArray statusBuf;
QStringList statusLines; QStringList statusLines;