summaryrefslogtreecommitdiffstats
path: root/certmanager/lib/backends
diff options
context:
space:
mode:
Diffstat (limited to 'certmanager/lib/backends')
-rw-r--r--certmanager/lib/backends/chiasmus/chiasmusjob.cpp8
-rw-r--r--certmanager/lib/backends/chiasmus/chiasmusjob.h4
-rw-r--r--certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp20
-rw-r--r--certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h8
-rw-r--r--certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp14
-rw-r--r--certmanager/lib/backends/qgpgme/gnupgprocessbase.h4
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp12
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp14
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h6
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp20
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h8
11 files changed, 59 insertions, 59 deletions
diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
index edfe9be52..2154f7aa6 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
@@ -110,8 +110,8 @@ GpgME::Error Kleo::ChiasmusJob::start() {
if ( const GpgME::Error err = setup() )
return mError = err;
- connect( mSymCryptRun, TQT_SIGNAL(processExited(KProcess*)),
- this, TQT_SLOT(slotProcessExited(KProcess*)) );
+ connect( mSymCryptRun, TQT_SIGNAL(processExited(TDEProcess*)),
+ this, TQT_SLOT(slotProcessExited(TDEProcess*)) );
if ( !mSymCryptRun->launch( mInput ) )
return mError = gpg_error( GPG_ERR_ENOENT ); // what else?
@@ -120,7 +120,7 @@ GpgME::Error Kleo::ChiasmusJob::start() {
return mError = 0;
}
-GpgME::Error Kleo::ChiasmusJob::slotProcessExited( KProcess * proc ) {
+GpgME::Error Kleo::ChiasmusJob::slotProcessExited( TDEProcess * proc ) {
if ( proc != mSymCryptRun )
mError = gpg_error( GPG_ERR_INTERNAL );
else if ( mCanceled )
@@ -172,7 +172,7 @@ GpgME::Error Kleo::ChiasmusJob::exec() {
if ( const GpgME::Error err = setup() )
return mError = err;
- if ( !mSymCryptRun->launch( mInput, KProcess::Block ) ) {
+ if ( !mSymCryptRun->launch( mInput, TDEProcess::Block ) ) {
delete mSymCryptRun; mSymCryptRun = 0;
return mError = gpg_error( GPG_ERR_ENOENT ); // what else?
}
diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.h b/certmanager/lib/backends/chiasmus/chiasmusjob.h
index a9e26a04a..1ca6ba19c 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusjob.h
+++ b/certmanager/lib/backends/chiasmus/chiasmusjob.h
@@ -40,7 +40,7 @@
#include <gpgmepp/context.h>
-class KProcess;
+class TDEProcess;
namespace Kleo {
@@ -91,7 +91,7 @@ namespace Kleo {
void slotCancel();
private slots:
- GpgME::Error slotProcessExited( KProcess * );
+ GpgME::Error slotProcessExited( TDEProcess * );
void slotTimeout();
private:
diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp
index 231cf6ad3..ec396537e 100644
--- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp
+++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp
@@ -45,7 +45,7 @@ Kleo::SymCryptRunProcessBase::SymCryptRunProcessBase( const TQString & class_, c
const TQString & keyFile, const TQString & options,
Operation mode,
TQObject * parent, const char * name )
- : KProcess( parent, name ),
+ : TDEProcess( parent, name ),
mOperation( mode ), mOptions( options )
{
*this << "symcryptrun"
@@ -58,10 +58,10 @@ Kleo::SymCryptRunProcessBase::SymCryptRunProcessBase( const TQString & class_, c
Kleo::SymCryptRunProcessBase::~SymCryptRunProcessBase() {}
bool Kleo::SymCryptRunProcessBase::launch( const TQByteArray & input, RunMode rm ) {
- connect( this, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),
- this, TQT_SLOT(slotReceivedStdout(KProcess*,char*,int)) );
- connect( this, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
- this, TQT_SLOT(slotReceivedStderr(KProcess*,char*,int)) );
+ connect( this, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+ this, TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) );
+ connect( this, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+ this, TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) );
if ( rm == Block ) {
KTempFile tempfile;
tempfile.setAutoDelete( true );
@@ -72,15 +72,15 @@ bool Kleo::SymCryptRunProcessBase::launch( const TQByteArray & input, RunMode rm
tempfile.close();
*this << "--input" << tempfile.name();
addOptions();
- return KProcess::start( Block, All );
+ return TDEProcess::start( Block, All );
} else {
addOptions();
- const bool ok = KProcess::start( rm, All );
+ const bool ok = TDEProcess::start( rm, All );
if ( !ok )
return ok;
mInput = input.copy();
writeStdin( mInput.begin(), mInput.size() );
- connect( this, TQT_SIGNAL(wroteStdin(KProcess*)), this, TQT_SLOT(closeStdin()) );
+ connect( this, TQT_SIGNAL(wroteStdin(TDEProcess*)), this, TQT_SLOT(closeStdin()) );
return true;
}
}
@@ -93,14 +93,14 @@ void Kleo::SymCryptRunProcessBase::addOptions() {
}
}
-void Kleo::SymCryptRunProcessBase::slotReceivedStdout( KProcess * proc, char * buf, int len ) {
+void Kleo::SymCryptRunProcessBase::slotReceivedStdout( TDEProcess * proc, char * buf, int len ) {
Q_ASSERT( proc == this );
const int oldsize = mOutput.size();
mOutput.resize( oldsize + len );
memcpy( mOutput.data() + oldsize, buf, len );
}
-void Kleo::SymCryptRunProcessBase::slotReceivedStderr( KProcess * proc, char * buf, int len ) {
+void Kleo::SymCryptRunProcessBase::slotReceivedStderr( TDEProcess * proc, char * buf, int len ) {
Q_ASSERT( proc == this );
if ( len > 0 )
mStderr += TQString::fromLocal8Bit( buf, len );
diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h
index 281b85530..36866e137 100644
--- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h
+++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h
@@ -41,7 +41,7 @@ class TQString;
namespace Kleo {
-class SymCryptRunProcessBase : public KProcess {
+class SymCryptRunProcessBase : public TDEProcess {
Q_OBJECT
public:
@@ -61,11 +61,11 @@ public:
public slots:
/*! upgraded to slot */
- void closeStdin() { KProcess::closeStdin(); }
+ void closeStdin() { TDEProcess::closeStdin(); }
private slots:
- void slotReceivedStdout( KProcess *, char *, int );
- void slotReceivedStderr( KProcess *, char *, int );
+ void slotReceivedStdout( TDEProcess *, char *, int );
+ void slotReceivedStderr( TDEProcess *, char *, int );
private:
void addOptions();
diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
index 53142fad8..bfd00ac92 100644
--- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
+++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
@@ -57,7 +57,7 @@ struct Kleo::GnuPGProcessBase::Private {
Kleo::GnuPGProcessBase::GnuPGProcessBase( TQObject * parent, const char * name )
- : KProcess( parent, name )
+ : TDEProcess( parent, name )
{
d = new Private();
}
@@ -76,7 +76,7 @@ bool Kleo::GnuPGProcessBase::start( RunMode runmode, Communication comm ) {
// set up the status-fd. This should be in setupCommunication(),
// but then it's too late: we need the fd of the pipe to pass it
// as argument to the --status-fd option:
- // PENDING(marc) find out why KProcess uses both pipe() and socketpair()...
+ // PENDING(marc) find out why TDEProcess uses both pipe() and socketpair()...
if ( ::pipe( d->statusFD ) < 0 ) {
kdDebug( 5150 ) << "Kleo::GnuPGProcessBase::start: pipe(2) failed: " << perror << endl;
return false;
@@ -94,11 +94,11 @@ bool Kleo::GnuPGProcessBase::start( RunMode runmode, Communication comm ) {
//arguments.insert( it, "--enable-progress-filter" ); // gpgsm doesn't know this
}
}
- return KProcess::start( runmode, comm );
+ return TDEProcess::start( runmode, comm );
}
int Kleo::GnuPGProcessBase::setupCommunication( Communication comm ) {
- if ( int ok = KProcess::setupCommunication( comm ) )
+ if ( int ok = TDEProcess::setupCommunication( comm ) )
return ok;
if ( d->usetStatusFD ) {
// base class impl returned error, so close our fd's, too
@@ -115,13 +115,13 @@ int Kleo::GnuPGProcessBase::commSetupDoneP() {
d->statnot = new TQSocketNotifier( d->statusFD[0], TQSocketNotifier::Read, this );
connect( d->statnot, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChildStatus(int)) );
}
- return KProcess::commSetupDoneP();
+ return TDEProcess::commSetupDoneP();
}
int Kleo::GnuPGProcessBase::commSetupDoneC() {
if ( d->usetStatusFD )
::fcntl( d->statusFD[1], F_SETFD, 0 );
- return KProcess::commSetupDoneC();
+ return TDEProcess::commSetupDoneC();
}
void Kleo::GnuPGProcessBase::slotChildStatus( int fd ) {
@@ -192,7 +192,7 @@ void Kleo::GnuPGProcessBase::parsetStatusOutput() {
}
void Kleo::GnuPGProcessBase::virtual_hook( int id, void * data ) {
- KProcess::virtual_hook( id, data );
+ TDEProcess::virtual_hook( id, data );
}
#include "gnupgprocessbase.moc"
diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
index 4f6dc4ad6..528179a2c 100644
--- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
+++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
@@ -40,12 +40,12 @@ namespace Kleo {
/**
* @short a base class for GPG and GPGSM processes.
*
- * This KProcess subclass implements the status-fd handling common
+ * This TDEProcess subclass implements the status-fd handling common
* to GPG and GPGSM.
*
* @author Marc Mutz <mutz@kde.org>
*/
- class GnuPGProcessBase : public KProcess {
+ class GnuPGProcessBase : public TDEProcess {
Q_OBJECT
public:
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
index 053a8b924..191ff4279 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
@@ -80,7 +80,7 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors )
// run the process:
int rc = 0;
- if ( !proc.start( KProcess::Block ) )
+ if ( !proc.start( TDEProcess::Block ) )
rc = -1;
else
rc = ( proc.normalExit() ) ? proc.exitStatus() : -2 ;
@@ -179,7 +179,7 @@ void QGpgMECryptoConfigComponent::runGpgConf()
// run the process:
int rc = 0;
- if ( !proc.start( KProcess::Block ) )
+ if ( !proc.start( TDEProcess::Block ) )
rc = -1;
else
rc = ( proc.normalExit() ) ? proc.exitStatus() : -1 ;
@@ -280,20 +280,20 @@ void QGpgMECryptoConfigComponent::sync( bool runtime )
if ( runtime )
commandLine += " --runtime";
commandLine += " --change-options ";
- commandLine += KProcess::quote( mName );
+ commandLine += TDEProcess::quote( mName );
commandLine += " < ";
- commandLine += KProcess::quote( tmpFile.name() );
+ commandLine += TDEProcess::quote( tmpFile.name() );
//kdDebug(5150) << commandLine << endl;
//system( TQCString( "cat " ) + tmpFile.name().latin1() ); // DEBUG
- KProcess proc;
+ TDEProcess proc;
proc.setUseShell( true );
proc << commandLine;
// run the process:
int rc = 0;
- if ( !proc.start( KProcess::Block ) )
+ if ( !proc.start( TDEProcess::Block ) )
rc = -1;
else
rc = ( proc.normalExit() ) ? proc.exitStatus() : -1 ;
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
index 16846b59b..6d05e1ecc 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
@@ -107,14 +107,14 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() {
mProcess->setUsetStatusFD( true );
- connect( mProcess, TQT_SIGNAL(processExited(KProcess*)),
- TQT_SLOT(slotProcessExited(KProcess*)) );
- connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
- TQT_SLOT(slotStderr(KProcess*,char*,int)) );
+ connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)),
+ TQT_SLOT(slotProcessExited(TDEProcess*)) );
+ connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+ TQT_SLOT(slotStderr(TDEProcess*,char*,int)) );
connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
- if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) {
+ if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::Stderr ) ) {
mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
deleteLater();
return mError;
@@ -182,11 +182,11 @@ void Kleo::QGpgMERefreshKeysJob::slotStatus( GnuPGProcessBase * proc, const TQSt
}
}
-void Kleo::QGpgMERefreshKeysJob::slotStderr( KProcess *, char *, int ) {
+void Kleo::QGpgMERefreshKeysJob::slotStderr( TDEProcess *, char *, int ) {
// implement? or not?
}
-void Kleo::QGpgMERefreshKeysJob::slotProcessExited( KProcess * proc ) {
+void Kleo::QGpgMERefreshKeysJob::slotProcessExited( TDEProcess * proc ) {
if ( proc != mProcess )
return;
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
index ebe871ce6..ac160036f 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
@@ -45,7 +45,7 @@ namespace GpgME {
class Error;
}
-class KProcess;
+class TDEProcess;
namespace Kleo {
@@ -64,8 +64,8 @@ namespace Kleo {
void slotCancel();
void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
- void slotStderr( KProcess *, char *, int );
- void slotProcessExited( KProcess * );
+ void slotStderr( TDEProcess *, char *, int );
+ void slotProcessExited( TDEProcess * );
private:
GpgME::Error startAProcess();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
index f409df735..f553c7039 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
@@ -88,16 +88,16 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern
mProcess->setUsetStatusFD( true );
- connect( mProcess, TQT_SIGNAL(processExited(KProcess*)),
- TQT_SLOT(slotProcessExited(KProcess*)) );
- connect( mProcess, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),
- TQT_SLOT(slotStdout(KProcess*,char*,int)) );
- connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
- TQT_SLOT(slotStderr(KProcess*,char*,int)) );
+ connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)),
+ TQT_SLOT(slotProcessExited(TDEProcess*)) );
+ connect( mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+ TQT_SLOT(slotStdout(TDEProcess*,char*,int)) );
+ connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+ TQT_SLOT(slotStderr(TDEProcess*,char*,int)) );
connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
- if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
+ if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) {
mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
deleteLater();
return mError;
@@ -165,7 +165,7 @@ void Kleo::QGpgMESecretKeyExportJob::slotStatus( GnuPGProcessBase * proc, const
}
}
-void Kleo::QGpgMESecretKeyExportJob::slotStdout( KProcess * proc, char * buf, int buflen ) {
+void Kleo::QGpgMESecretKeyExportJob::slotStdout( TDEProcess * proc, char * buf, int buflen ) {
if ( proc != mProcess )
return;
if ( buflen <= 0 )
@@ -177,11 +177,11 @@ void Kleo::QGpgMESecretKeyExportJob::slotStdout( KProcess * proc, char * buf, in
memcpy( mKeyData.data() + oldlen, buf, buflen );
}
-void Kleo::QGpgMESecretKeyExportJob::slotStderr( KProcess *, char *, int ) {
+void Kleo::QGpgMESecretKeyExportJob::slotStderr( TDEProcess *, char *, int ) {
// implement? or not?
}
-void Kleo::QGpgMESecretKeyExportJob::slotProcessExited( KProcess * proc ) {
+void Kleo::QGpgMESecretKeyExportJob::slotProcessExited( TDEProcess * proc ) {
if ( proc != mProcess )
return;
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
index 4c3c8b820..335fd7703 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
@@ -50,7 +50,7 @@ namespace QGpgME {
class TQByteArrayDataProvider;
}
-class KProcess;
+class TDEProcess;
namespace Kleo {
@@ -69,9 +69,9 @@ namespace Kleo {
void slotCancel();
void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
- void slotStdout( KProcess *, char *, int );
- void slotStderr( KProcess *, char *, int );
- void slotProcessExited( KProcess * );
+ void slotStdout( TDEProcess *, char *, int );
+ void slotStderr( TDEProcess *, char *, int );
+ void slotProcessExited( TDEProcess * );
private:
GnuPGProcessBase * mProcess;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-27 21:02:37 +0000