diff options
Diffstat (limited to 'certmanager/lib/backends')
34 files changed, 81 insertions, 81 deletions
diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp index e89070f3..d5083b96 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp @@ -442,7 +442,7 @@ bool Kleo::ChiasmusBackend::checkForSMIME( TQString * reason ) const { bool Kleo::ChiasmusBackend::checkForChiasmus( TQString * reason ) const { // kills the protocol instance when we return false: - std::auto_ptr<Protocol> tmp( mProtocol ); + std::unique_ptr<Protocol> tmp( mProtocol ); mProtocol = 0; const CryptoConfigEntry * path = config()->entry( "Chiasmus", "General", "path" ); diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp index 265d759b..5c49478e 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp @@ -90,7 +90,7 @@ GpgME::Error Kleo::ChiasmusJob::setup() { : SymCryptRunProcessBase::Decrypt, this, "symcryptrun" ); TQTimer::singleShot( timeoutEntry->uintValue() * 1000, this, - TQT_SLOT( slotTimeout() ) ); + TQ_SLOT( slotTimeout() ) ); return 0; } @@ -110,8 +110,8 @@ GpgME::Error Kleo::ChiasmusJob::start() { if ( const GpgME::Error err = setup() ) return mError = err; - connect( mSymCryptRun, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); + connect( mSymCryptRun, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*)) ); if ( !mSymCryptRun->launch( mInput ) ) 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 69274d10..d46d530d 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusjob.h +++ b/certmanager/lib/backends/chiasmus/chiasmusjob.h @@ -50,7 +50,7 @@ namespace Kleo { @short SpecialJob for Chiasmus operations */ class ChiasmusJob : public Kleo::SpecialJob { - Q_OBJECT + TQ_OBJECT TQ_ENUMS( Mode ) TQ_PROPERTY( Mode mode READ mode ) diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp index d7ae22c1..90f51243 100644 --- a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp +++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp @@ -70,7 +70,7 @@ Kleo::ObtainKeysJob::ObtainKeysJob() Kleo::ObtainKeysJob::~ObtainKeysJob() {} GpgME::Error Kleo::ObtainKeysJob::start() { - TQTimer::singleShot( 0, this, TQT_SLOT(slotPerform()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotPerform()) ); return mError = 0; } @@ -109,7 +109,7 @@ void Kleo::ObtainKeysJob::slotPerform( bool async ) { ++mIndex; if ( async ) - TQTimer::singleShot( 0, this, TQT_SLOT(slotPerform()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotPerform()) ); else slotPerform( false ); } diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.h b/certmanager/lib/backends/chiasmus/obtainkeysjob.h index 3f7246ab..29557c14 100644 --- a/certmanager/lib/backends/chiasmus/obtainkeysjob.h +++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.h @@ -63,7 +63,7 @@ namespace Kleo { absolute filenames of the keys found in the configured key files. */ class ObtainKeysJob : public Kleo::SpecialJob { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQStringList result READ result ) public: diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp index 9391f023..34ac1d66 100644 --- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp +++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp @@ -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(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)) ); + connect( this, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) ); + connect( this, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) ); if ( rm == Block ) { KTempFile tempfile; tempfile.setAutoDelete( true ); @@ -80,7 +80,7 @@ bool Kleo::SymCryptRunProcessBase::launch( const TQByteArray & input, RunMode rm return ok; mInput = input.copy(); writeStdin( mInput.begin(), mInput.size() ); - connect( this, TQT_SIGNAL(wroteStdin(TDEProcess*)), this, TQT_SLOT(closeStdin()) ); + connect( this, TQ_SIGNAL(wroteStdin(TDEProcess*)), this, TQ_SLOT(closeStdin()) ); return true; } } diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h index 36866e13..b5b60fe5 100644 --- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h +++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h @@ -33,7 +33,7 @@ #ifndef __KLEO_BACKEND_CHIASMUS__SYMCRYPTRUNPROCESSBASE_H__ #define __KLEO_BACKEND_CHIASMUS__SYMCRYPTRUNPROCESSBASE_H__ -#include <kprocess.h> +#include <tdeprocess.h> #include <tqcstring.h> @@ -42,7 +42,7 @@ class TQString; namespace Kleo { class SymCryptRunProcessBase : public TDEProcess { - Q_OBJECT + TQ_OBJECT public: enum Operation { diff --git a/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp b/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp index 3d28ac4b..5ab83715 100644 --- a/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp +++ b/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp @@ -264,7 +264,7 @@ GpgME::Error Kleo::KpgpKeyListJob::start( const TQStringList & patterns, bool secretOnly ) { mPatterns = patterns; mSecretOnly = secretOnly; - TQTimer::singleShot( 0, this, TQT_SLOT( slotDoIt() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDoIt() ) ); return GpgME::Error( 0 ); } diff --git a/certmanager/lib/backends/kpgp/kpgpkeylistjob.h b/certmanager/lib/backends/kpgp/kpgpkeylistjob.h index 3434dd97..3ab04cf3 100644 --- a/certmanager/lib/backends/kpgp/kpgpkeylistjob.h +++ b/certmanager/lib/backends/kpgp/kpgpkeylistjob.h @@ -50,7 +50,7 @@ namespace Kpgp { namespace Kleo { class KpgpKeyListJob : public KeyListJob { - Q_OBJECT + TQ_OBJECT public: KpgpKeyListJob( Kpgp::Base * pgpBase ); diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp index bfd00ac9..e0da7eca 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp @@ -113,7 +113,7 @@ int Kleo::GnuPGProcessBase::commSetupDoneP() { if ( d->usetStatusFD ) { ::close( d->statusFD[1] ); // close the input end of the pipe, we're the reader d->statnot = new TQSocketNotifier( d->statusFD[0], TQSocketNotifier::Read, this ); - connect( d->statnot, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChildStatus(int)) ); + connect( d->statnot, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChildStatus(int)) ); } return TDEProcess::commSetupDoneP(); } diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h index 528179a2..d894884e 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h @@ -33,7 +33,7 @@ #ifndef __KLEO_GNUPGPROCESSBASE_H__ #define __KLEO_GNUPGPROCESSBASE_H__ -#include <kprocess.h> +#include <tdeprocess.h> namespace Kleo { @@ -46,7 +46,7 @@ namespace Kleo { * @author Marc Mutz <mutz@kde.org> */ class GnuPGProcessBase : public TDEProcess { - Q_OBJECT + TQ_OBJECT public: GnuPGProcessBase( TQObject * parent=0, const char * name=0 ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp index ee4128bf..86439bb9 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp @@ -43,7 +43,7 @@ #include <gpgmepp/engineinfo.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include <tqstring.h> diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp index e73b4363..c77dcb20 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp @@ -32,7 +32,7 @@ #include "qgpgmecryptoconfig.h" #include <kdebug.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <errno.h> #include <tdemessagebox.h> #include <tdelocale.h> @@ -71,12 +71,12 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors ) { // Run gpgconf --list-components to make the list of components - KProcIO proc( TQTextCodec::codecForName( "utf8" ) ); + TDEProcIO proc( TQTextCodec::codecForName( "utf8" ) ); proc << "gpgconf"; // must be in the PATH proc << "--list-components"; - TQObject::connect( &proc, TQT_SIGNAL( readReady(KProcIO*) ), - this, TQT_SLOT( slotCollectStdOut(KProcIO*) ) ); + TQObject::connect( &proc, TQ_SIGNAL( readReady(TDEProcIO*) ), + this, TQ_SLOT( slotCollectStdOut(TDEProcIO*) ) ); // run the process: int rc = 0; @@ -100,7 +100,7 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors ) mParsed = true; } -void QGpgMECryptoConfig::slotCollectStdOut( KProcIO* proc ) +void QGpgMECryptoConfig::slotCollectStdOut( TDEProcIO* proc ) { TQString line; int result; @@ -166,15 +166,15 @@ void QGpgMECryptoConfigComponent::runGpgConf() { // Run gpgconf --list-options <component>, and create all groups and entries for that component - KProcIO proc( TQTextCodec::codecForName( "utf8" ) ); + TDEProcIO proc( TQTextCodec::codecForName( "utf8" ) ); proc << "gpgconf"; // must be in the PATH proc << "--list-options"; proc << mName; //kdDebug(5150) << "Running gpgconf --list-options " << mName << endl; - TQObject::connect( &proc, TQT_SIGNAL( readReady(KProcIO*) ), - this, TQT_SLOT( slotCollectStdOut(KProcIO*) ) ); + TQObject::connect( &proc, TQ_SIGNAL( readReady(TDEProcIO*) ), + this, TQ_SLOT( slotCollectStdOut(TDEProcIO*) ) ); mCurrentGroup = 0; // run the process: @@ -192,7 +192,7 @@ void QGpgMECryptoConfigComponent::runGpgConf() } } -void QGpgMECryptoConfigComponent::slotCollectStdOut( KProcIO* proc ) +void QGpgMECryptoConfigComponent::slotCollectStdOut( TDEProcIO* proc ) { TQString line; int result; @@ -265,7 +265,7 @@ void QGpgMECryptoConfigComponent::sync( bool runtime ) line += ":16:"; } line += '\n'; - TQCString line8bit = line.utf8(); // encode with utf8, and KProcIO uses utf8 when reading. + TQCString line8bit = line.utf8(); // encode with utf8, and TDEProcIO uses utf8 when reading. tmpFile.file()->writeBlock( line8bit.data(), line8bit.size()-1 /*no 0*/ ); dirtyEntries.append( it.current() ); } diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h index 712ce24e..5fbc9f63 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h +++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h @@ -38,7 +38,7 @@ #include <tqstringlist.h> #include <tqobject.h> #include <tqvariant.h> -class KProcIO; +class TDEProcIO; class QGpgMECryptoConfigComponent; class QGpgMECryptoConfigEntry; @@ -48,7 +48,7 @@ class QGpgMECryptoConfigEntry; */ class QGpgMECryptoConfig : public TQObject, public Kleo::CryptoConfig { - Q_OBJECT + TQ_OBJECT public: /** @@ -65,7 +65,7 @@ public: virtual void sync( bool runtime ); private slots: - void slotCollectStdOut( KProcIO* proc ); + void slotCollectStdOut( TDEProcIO* proc ); private: /// @param showErrors if true, a messagebox will be shown if e.g. gpgconf wasn't found void runGpgConf( bool showErrors ); @@ -80,7 +80,7 @@ class QGpgMECryptoConfigGroup; /// For docu, see kleo/cryptoconfig.h class QGpgMECryptoConfigComponent : public TQObject, public Kleo::CryptoConfigComponent { - Q_OBJECT + TQ_OBJECT public: QGpgMECryptoConfigComponent( QGpgMECryptoConfig*, const TQString& name, const TQString& description ); @@ -95,7 +95,7 @@ public: void sync( bool runtime ); private slots: - void slotCollectStdOut( KProcIO* proc ); + void slotCollectStdOut( TDEProcIO* proc ); private: void runGpgConf(); diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h index e58ea326..ea3454fe 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h @@ -47,7 +47,7 @@ namespace GpgME { namespace Kleo { class QGpgMEDecryptJob : public DecryptJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEDecryptJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h index 7e4eda03..255e3fdd 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h @@ -38,7 +38,7 @@ #include "qgpgmejob.h" #include <tqcstring.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { class Error; @@ -47,8 +47,8 @@ namespace GpgME { namespace Kleo { - class KDE_EXPORT QGpgMEDecryptVerifyJob : public DecryptVerifyJob, private QGpgMEJob { - Q_OBJECT + class TDE_EXPORT QGpgMEDecryptVerifyJob : public DecryptVerifyJob, private QGpgMEJob { + TQ_OBJECT TQGPGME_JOB public: QGpgMEDecryptVerifyJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h b/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h index 20dca974..c867b855 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h @@ -46,7 +46,7 @@ namespace GpgME { namespace Kleo { class QGpgMEDeleteJob : public DeleteJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEDeleteJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h b/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h index 5317afd4..1facc509 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h @@ -45,7 +45,7 @@ namespace GpgME { namespace Kleo { class QGpgMEDownloadJob : public DownloadJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEDownloadJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h index 80b5e467..13b7546c 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h @@ -50,7 +50,7 @@ namespace GpgME { namespace Kleo { class QGpgMEEncryptJob : public EncryptJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEEncryptJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h index aa2e0c0a..7e427d6c 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h @@ -47,7 +47,7 @@ namespace GpgME { namespace Kleo { class QGpgMEExportJob : public ExportJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEExportJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h b/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h index 2324da6d..0a5ab681 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h @@ -47,7 +47,7 @@ namespace GpgME { namespace Kleo { class QGpgMEImportJob : public ImportJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEImportJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp index 947a5258..8c378536 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp @@ -47,7 +47,7 @@ #include <gpgmepp/data.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqstring.h> #include <tqstringlist.h> @@ -96,8 +96,8 @@ Kleo::QGpgMEJob::QGpgMEJob( Kleo::Job * _this, GpgME::Context * context ) { InvarianceChecker check( this ); assert( context ); - TQObject::connect( QGpgME::EventLoopInteractor::instance(), TQT_SIGNAL(aboutToDestroy()), - _this, TQT_SLOT(slotCancel()) ); + TQObject::connect( QGpgME::EventLoopInteractor::instance(), TQ_SIGNAL(aboutToDestroy()), + _this, TQ_SLOT(slotCancel()) ); context->setProgressProvider( this ); // (mmutz) work around a gpgme bug in versions at least <= 0.9.0. // These versions will return GPG_ERR_NOT_IMPLEMENTED from @@ -153,8 +153,8 @@ void Kleo::QGpgMEJob::deleteAllPatterns() { void Kleo::QGpgMEJob::hookupContextToEventLoopInteractor() { mCtx->setManagedByEventLoopInteractor( true ); TQObject::connect( QGpgME::EventLoopInteractor::instance(), - TQT_SIGNAL(operationDoneEventSignal(GpgME::Context*,const GpgME::Error&)), - mThis, TQT_SLOT(slotOperationDoneEvent(GpgME::Context*,const GpgME::Error&)) ); + TQ_SIGNAL(operationDoneEventSignal(GpgME::Context*,const GpgME::Error&)), + mThis, TQ_SLOT(slotOperationDoneEvent(GpgME::Context*,const GpgME::Error&)) ); } void Kleo::QGpgMEJob::setPatterns( const TQStringList & sl, bool allowEmpty ) { diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.h b/certmanager/lib/backends/qgpgme/qgpgmejob.h index 64ce36bc..aabfb701 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmejob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmejob.h @@ -43,7 +43,7 @@ #include <tqstring.h> #include <vector> -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { class Data; @@ -75,7 +75,7 @@ namespace Kleo { signal there. Pass "this" as the first argument this QGpgMEJOb's ctor. The rest is dealt with automatically. */ - class KDE_EXPORT QGpgMEJob : public GpgME::ProgressProvider, public GpgME::PassphraseProvider { + class TDE_EXPORT QGpgMEJob : public GpgME::ProgressProvider, public GpgME::PassphraseProvider { public: QGpgMEJob( Kleo::Job * _this, GpgME::Context * context ); ~QGpgMEJob(); diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h index 0b1362c9..f5f46669 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h @@ -36,7 +36,7 @@ #include <kleo/keygenerationjob.h> #include "qgpgmejob.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { class Error; @@ -51,8 +51,8 @@ namespace QGpgME { namespace Kleo { - class KDE_EXPORT QGpgMEKeyGenerationJob : public KeyGenerationJob, private QGpgMEJob { - Q_OBJECT + class TDE_EXPORT QGpgMEKeyGenerationJob : public KeyGenerationJob, private QGpgMEJob { + TQ_OBJECT TQGPGME_JOB public: QGpgMEKeyGenerationJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp index 5561625c..25edaf84 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp @@ -79,8 +79,8 @@ GpgME::Error Kleo::QGpgMEKeyListJob::start( const TQStringList & pats, bool secr hookupContextToEventLoopInteractor(); connect( QGpgME::EventLoopInteractor::instance(), - TQT_SIGNAL(nextKeyEventSignal(GpgME::Context*,const GpgME::Key&)), - TQT_SLOT(slotNextKeyEvent(GpgME::Context*,const GpgME::Key&)) ); + TQ_SIGNAL(nextKeyEventSignal(GpgME::Context*,const GpgME::Key&)), + TQ_SLOT(slotNextKeyEvent(GpgME::Context*,const GpgME::Key&)) ); // The communication channel between gpgme and gpgsm is limited in // the number of patterns that can be transported, but they won't @@ -100,7 +100,7 @@ GpgME::Error Kleo::QGpgMEKeyListJob::start( const TQStringList & pats, bool secr } } else if ( err.code() == GPG_ERR_EOF ) { kdDebug(5150) << "QGpgMEKeyListJob::start(): early end of keylisting, trying to fake an empty result" << endl; - TQTimer::singleShot( 10, this, TQT_SLOT(slotFakeOperationDoneEvent()) ); + TQTimer::singleShot( 10, this, TQ_SLOT(slotFakeOperationDoneEvent()) ); return GpgME::Error(); } deleteLater(); diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h index 8e26d791..a62a7379 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h @@ -48,7 +48,7 @@ namespace GpgME { namespace Kleo { class QGpgMEKeyListJob : public KeyListJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEKeyListJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp index 6d05e1ec..8088d28a 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp @@ -107,12 +107,12 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() { mProcess->setUsetStatusFD( true ); - 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&)) ); + connect( mProcess, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(slotProcessExited(TDEProcess*)) ); + connect( mProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + TQ_SLOT(slotStderr(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), + TQ_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::Stderr ) ) { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else? diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h index ac160036..78c26ef3 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h @@ -50,7 +50,7 @@ class TDEProcess; namespace Kleo { class QGpgMERefreshKeysJob : public RefreshKeysJob { - Q_OBJECT + TQ_OBJECT public: QGpgMERefreshKeysJob(); diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp index f553c703..af72a539 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp @@ -88,14 +88,14 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern mProcess->setUsetStatusFD( true ); - 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&)) ); + connect( mProcess, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(slotProcessExited(TDEProcess*)) ); + connect( mProcess, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + TQ_SLOT(slotStdout(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + TQ_SLOT(slotStderr(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), + TQ_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else? diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h index 335fd770..1dad417c 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h @@ -55,7 +55,7 @@ class TDEProcess; namespace Kleo { class QGpgMESecretKeyExportJob : public ExportJob { - Q_OBJECT + TQ_OBJECT public: QGpgMESecretKeyExportJob( bool armour, const TQString& charset ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h index 90079706..216faeb5 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h @@ -44,7 +44,7 @@ #include <utility> -#include <kdemacros.h> +#include <tdemacros.h> namespace GpgME { class Error; class Context; @@ -53,8 +53,8 @@ namespace GpgME { namespace Kleo { - class KDE_EXPORT QGpgMESignEncryptJob : public SignEncryptJob, private QGpgMEJob { - Q_OBJECT + class TDE_EXPORT QGpgMESignEncryptJob : public SignEncryptJob, private QGpgMEJob { + TQ_OBJECT TQGPGME_JOB public: QGpgMESignEncryptJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignjob.h index 2b51eada..388b2756 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesignjob.h @@ -50,7 +50,7 @@ namespace GpgME { namespace Kleo { class QGpgMESignJob : public SignJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMESignJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h b/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h index a62699d3..5e9728d3 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h @@ -47,7 +47,7 @@ namespace GpgME { namespace Kleo { class QGpgMEVerifyDetachedJob : public VerifyDetachedJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEVerifyDetachedJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h b/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h index 87a19619..ea596e13 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h @@ -47,7 +47,7 @@ namespace GpgME { namespace Kleo { class QGpgMEVerifyOpaqueJob : public VerifyOpaqueJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEVerifyOpaqueJob( GpgME::Context * context ); |