diff options
Diffstat (limited to 'certmanager')
| -rw-r--r-- | certmanager/lib/backends/chiasmus/chiasmusbackend.cpp | 2 | ||||
| -rw-r--r-- | certmanager/lib/cryptplug.cpp | 4 | ||||
| -rw-r--r-- | certmanager/lib/tests/test_jobs.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp index e89070f39..d5083b96e 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/cryptplug.cpp b/certmanager/lib/cryptplug.cpp index 20747457a..24ded7959 100644 --- a/certmanager/lib/cryptplug.cpp +++ b/certmanager/lib/cryptplug.cpp @@ -696,8 +696,8 @@ GpgME::ImportResult CryptPlug::importCertificateFromMem( const char* data, size_ { using namespace GpgME; - std::auto_ptr<Context> context( Context::createForProtocol( mProtocol ) ); - if ( !context.get() ) + std::unique_ptr<Context> context( Context::createForProtocol( mProtocol ) ); + if ( !context ) return ImportResult(); Data keydata( data, length, false ); diff --git a/certmanager/lib/tests/test_jobs.cpp b/certmanager/lib/tests/test_jobs.cpp index ba26bfb58..661e07dae 100644 --- a/certmanager/lib/tests/test_jobs.cpp +++ b/certmanager/lib/tests/test_jobs.cpp @@ -61,8 +61,8 @@ static void testSign() std::vector<GpgME::Key> signingKeys; - std::auto_ptr<Kleo::KeyListJob> listJob( proto->keyListJob( false, false, true ) ); // use validating keylisting - if ( listJob.get() ) { + std::unique_ptr<Kleo::KeyListJob> listJob( proto->keyListJob( false, false, true ) ); // use validating keylisting + if ( listJob ) { // ##### Adjust this to your own identity listJob->exec( "faure@kde.org", true /*secret*/, signingKeys ); assert( !signingKeys.empty() ); |