diff options
Diffstat (limited to 'certmanager/lib/backends/chiasmus/chiasmusbackend.cpp')
| -rw-r--r-- | certmanager/lib/backends/chiasmus/chiasmusbackend.cpp | 13 |
1 files changed, 5 insertions, 8 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" ); |