diff options
Diffstat (limited to 'kmail/messagecomposer.cpp')
| -rw-r--r-- | kmail/messagecomposer.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp index 60ceed94..1cc0cd33 100644 --- a/kmail/messagecomposer.cpp +++ b/kmail/messagecomposer.cpp @@ -373,7 +373,7 @@ void MessageComposer::doNextJob() } // We have more jobs to do, but allow others to come first - TQTimer::singleShot( 0, this, TQT_SLOT( slotDoNextJob() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDoNextJob() ) ); } void MessageComposer::emitDone( bool b ) @@ -552,8 +552,8 @@ bool MessageComposer::encryptWithChiasmus( const Kleo::CryptoBackend::Protocol * const TQByteArray& body, TQByteArray& resultData ) { - std::auto_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-encrypt", TQStringVariantMap() ) ); - if ( !job.get() ) { + std::unique_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-encrypt", TQStringVariantMap() ) ); + if ( !job ) { const TQString msg = i18n( "Chiasmus backend does not offer the " "\"x-encrypt\" function. Please report this bug." ); KMessageBox::error( mComposeWin, msg, i18n( "Chiasmus Backend Error" ) ); @@ -2162,10 +2162,10 @@ void MessageComposer::pgpSignedMsg( const TQByteArray& cText, Kleo::CryptoMessag = isSMIME( format ) ? cpf->smime() : cpf->openpgp() ; assert( proto ); /// hmmm.....? - std::auto_ptr<Kleo::SignJob> job( proto->signJob( armor( format ), + std::unique_ptr<Kleo::SignJob> job( proto->signJob( armor( format ), textMode( format ) ) ); - if ( !job.get() ) { + if ( !job ) { KMessageBox::sorry( mComposeWin, i18n("This message could not be signed, " "since the chosen backend does not seem to support " @@ -2218,9 +2218,9 @@ Kpgp::Result MessageComposer::pgpEncryptedMsg( TQByteArray & encryptedBody, = isSMIME( format ) ? cpf->smime() : cpf->openpgp() ; assert( proto ); // hmmmm....? - std::auto_ptr<Kleo::EncryptJob> job( proto->encryptJob( armor( format ), + std::unique_ptr<Kleo::EncryptJob> job( proto->encryptJob( armor( format ), textMode( format ) ) ); - if ( !job.get() ) { + if ( !job ) { KMessageBox::sorry( mComposeWin, i18n("This message could not be encrypted, " "since the chosen backend does not seem to support " @@ -2266,9 +2266,9 @@ Kpgp::Result MessageComposer::pgpSignedAndEncryptedMsg( TQByteArray & encryptedB = isSMIME( format ) ? cpf->smime() : cpf->openpgp() ; assert( proto ); // hmmmm....? - std::auto_ptr<Kleo::SignEncryptJob> job( proto->signEncryptJob( armor( format ), + std::unique_ptr<Kleo::SignEncryptJob> job( proto->signEncryptJob( armor( format ), textMode( format ) ) ); - if ( !job.get() ) { + if ( !job ) { KMessageBox::sorry( mComposeWin, i18n("This message could not be signed and encrypted, " "since the chosen backend does not seem to support " |