diff options
Diffstat (limited to 'certmanager/lib/backends/chiasmus')
7 files changed, 20 insertions, 23 deletions
diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp index 7ed31197..d5083b96 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp @@ -126,9 +126,6 @@ namespace { } // some special types: - template <> struct from_helper<bool> : public TQVariant { - from_helper( bool b ) : TQVariant( b, int() ) {} - }; template <> struct from_helper<KURL> : public TQVariant { from_helper( const KURL & url ) : TQVariant( url.path() ) {} }; @@ -180,7 +177,7 @@ namespace { if ( argType() != ArgType_Path && argType()!= ArgType_DirPath ) return mValue.toStringList(); else return to<KURL::List>( mValue ); } void resetToDefault() { mValue = defaultValue(); mDirty = false; } - void setBoolValue( bool value ) { setValue( TQVariant( value, int() ) ); } + void setBoolValue( bool value ) { setValue( TQVariant( value ) ); } void setStringValue( const TQString & value ) { setValue( value ); } void setIntValue( int value ) { setValue( value ); } void setUIntValue( unsigned int value ) { setValue( value ); } @@ -219,9 +216,9 @@ namespace { return TQVariant(); case ArgType_None: if ( isList() ) - return TQValueList<TQVariant>() << TQVariant( data.defaults.boolean.value, int() ); + return TQValueList<TQVariant>() << TQVariant( data.defaults.boolean.value ); else - return TQVariant( data.defaults.boolean.value, int() ); + return TQVariant( data.defaults.boolean.value ); case ArgType_String: if ( isList() ) return TQStringList( TQString::fromLatin1( data.defaults.string ) ); @@ -377,7 +374,7 @@ public: DecryptVerifyJob * decryptVerifyJob( bool ) const { return 0; } RefreshKeysJob * refreshKeysJob() const { return 0; } - SpecialJob * specialJob( const char * type, const TQMap<TQString,TQVariant> & args ) const { + SpecialJob * specialJob( const char * type, const TQStringVariantMap & args ) const { if ( tqstricmp( type, "x-obtain-keys" ) == 0 && args.size() == 0 ) return new ObtainKeysJob(); if ( tqstricmp( type, "x-encrypt" ) == 0 && args.size() == 0 ) @@ -445,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 09a1c7c3..29557c14 100644 --- a/certmanager/lib/backends/chiasmus/obtainkeysjob.h +++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.h @@ -56,14 +56,14 @@ namespace Kleo { To use, create an ObtainKeysJob instance like this: <code> Kleo::SpecialJob * job = - protocol->specialJob("x-obtain-keys", TQMap<TQString,TQVariant>()); + protocol->specialJob("x-obtain-keys", TQStringVariantMap()); </code> The resulting TQVariant will contain a TQStringList containing the 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 { |