diff options
Diffstat (limited to 'kmail/objecttreeparser.cpp')
| -rw-r--r-- | kmail/objecttreeparser.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp index 71858bd1..de0faee2 100644 --- a/kmail/objecttreeparser.cpp +++ b/kmail/objecttreeparser.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* objecttreeparser.cpp This file is part of KMail, the KDE mail client. @@ -91,7 +91,7 @@ #include <tdeglobal.h> #include <tdehtml_part.h> #include <tdetempfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdemessagebox.h> #include <kiconloader.h> @@ -609,7 +609,7 @@ namespace KMail { if ( key.numUserIDs() > 0 && key.userID( 0 ).id() ) messagePart.signer = Kleo::DN( key.userID( 0 ).id() ).prettyDN(); for ( uint iMail = 0; iMail < key.numUserIDs(); ++iMail ) { - // The following if /should/ always result in TRUE but we + // The following if /should/ always result in true but we // won't trust implicitely the plugin that gave us these data. if ( key.userID( iMail ).email() ) { TQString email = TQString::fromUtf8( key.userID( iMail ).email() ); @@ -1652,7 +1652,7 @@ namespace KMail { const TQByteArray certData = node->msgPart().bodyDecodedBinary(); - const STD_NAMESPACE_PREFIX auto_ptr<Kleo::ImportJob> import( smimeCrypto->importJob() ); + const STD_NAMESPACE_PREFIX unique_ptr<Kleo::ImportJob> import( smimeCrypto->importJob() ); const GpgME::ImportResult res = import->exec( certData ); if ( res.error() ) { htmlWriter()->queue( i18n( "Sorry, certificate could not be imported.<br>" @@ -1853,8 +1853,8 @@ bool ObjectTreeParser::decryptChiasmus( const TQByteArray& data, TQByteArray& bo if ( !chiasmus ) return false; - const STD_NAMESPACE_PREFIX auto_ptr<Kleo::SpecialJob> listjob( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) ); - if ( !listjob.get() ) { + const STD_NAMESPACE_PREFIX unique_ptr<Kleo::SpecialJob> listjob( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) ); + if ( !listjob ) { errorText = i18n( "Chiasmus backend does not offer the " "\"x-obtain-keys\" function. Please report this bug." ); return false; @@ -1892,8 +1892,8 @@ bool ObjectTreeParser::decryptChiasmus( const TQByteArray& data, TQByteArray& bo GlobalSettings::setChiasmusDecryptionKey( selectorDlg.key() ); assert( !GlobalSettings::chiasmusDecryptionKey().isEmpty() ); - const STD_NAMESPACE_PREFIX auto_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-decrypt", TQStringVariantMap() ) ); - if ( !job.get() ) { + const STD_NAMESPACE_PREFIX unique_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-decrypt", TQStringVariantMap() ) ); + if ( !job ) { errorText = i18n( "Chiasmus backend does not offer the " "\"x-decrypt\" function. Please report this bug." ); return false; @@ -2982,7 +2982,7 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate ) TQString line; /* search next occurrence of '\n' */ - pos = s.find('\n', beg, FALSE); + pos = s.find('\n', beg, false); if (pos == (unsigned int)(-1)) pos = length; |