From 9b36ebf37a3b889c955ba68038bd5b3d9c5cde4e Mon Sep 17 00:00:00 2001
From: Andre Heinecke <aheinecke@intevation.de>
Date: Tue, 17 May 2016 17:49:56 +0200
Subject: Qt / Cpp: Port auto_ptr to unique_ptr

* lang/cpp/src/context.cpp,
lang/cpp/src/context.h,
lang/cpp/src/context_p.h (Context::createForEngine),
(Context::edit, Context::startEditing),
(Context::takeLastEditInteractor, Context::cardEdit),
(Context::startCardEditing, Context::takeLastCardEditInteractor),
(Context::assuanTransact, Context::startAssuanTransaction),
(Context::takeLastAssuanTransaction): Port to unique_ptr.
* lang/qt/src/qgpgmeadduseridjob.cpp,
lang/qt/src/qgpgmechangeexpiryjob.cpp,
lang/qt/src/qgpgmechangeownertrustjob.cpp,
lang/qt/src/qgpgmechangepasswdjob.cpp,
lang/qt/src/qgpgmesignkeyjob.cpp: Update accordingly.

--
This is another API break but as we already broke API with GpgME++
and QGpgME from KDE Frameworks this is a good time to do this
to avoid using a deprected C++ class in the API.
---
 lang/cpp/src/context.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'lang/cpp/src/context.h')

diff --git a/lang/cpp/src/context.h b/lang/cpp/src/context.h
index ee4f847e..a8112d62 100644
--- a/lang/cpp/src/context.h
+++ b/lang/cpp/src/context.h
@@ -69,7 +69,7 @@ public:
     //
 
     static Context *createForProtocol(Protocol proto);
-    static std::auto_ptr<Context> createForEngine(Engine engine, Error *err = 0);
+    static std::unique_ptr<Context> createForEngine(Engine engine, Error *err = 0);
     virtual ~Context();
 
     //
@@ -188,21 +188,21 @@ public:
     // Key Editing
     //
 
-    GpgME::Error edit(const Key &key, std::auto_ptr<EditInteractor> function, Data &out);
-    GpgME::Error startEditing(const Key &key, std::auto_ptr<EditInteractor> function, Data &out);
+    GpgME::Error edit(const Key &key, std::unique_ptr<EditInteractor> function, Data &out);
+    GpgME::Error startEditing(const Key &key, std::unique_ptr<EditInteractor> function, Data &out);
 
     EditInteractor *lastEditInteractor() const;
-    std::auto_ptr<EditInteractor> takeLastEditInteractor();
+    std::unique_ptr<EditInteractor> takeLastEditInteractor();
 
     //
     // SmartCard Editing
     //
 
-    GpgME::Error cardEdit(const Key &key, std::auto_ptr<EditInteractor> function, Data &out);
-    GpgME::Error startCardEditing(const Key &key, std::auto_ptr<EditInteractor> function, Data &out);
+    GpgME::Error cardEdit(const Key &key, std::unique_ptr<EditInteractor> function, Data &out);
+    GpgME::Error startCardEditing(const Key &key, std::unique_ptr<EditInteractor> function, Data &out);
 
     EditInteractor *lastCardEditInteractor() const;
-    std::auto_ptr<EditInteractor> takeLastCardEditInteractor();
+    std::unique_ptr<EditInteractor> takeLastCardEditInteractor();
 
     //
     // Trust Item Management
@@ -216,14 +216,14 @@ public:
     // Assuan Transactions
     //
 
-    AssuanResult assuanTransact(const char *command, std::auto_ptr<AssuanTransaction> transaction);
+    AssuanResult assuanTransact(const char *command, std::unique_ptr<AssuanTransaction> transaction);
     AssuanResult assuanTransact(const char *command);
-    GpgME::Error startAssuanTransaction(const char *command, std::auto_ptr<AssuanTransaction> transaction);
+    GpgME::Error startAssuanTransaction(const char *command, std::unique_ptr<AssuanTransaction> transaction);
     GpgME::Error startAssuanTransaction(const char *command);
     AssuanResult assuanResult() const;
 
     AssuanTransaction *lastAssuanTransaction() const;
-    std::auto_ptr<AssuanTransaction> takeLastAssuanTransaction();
+    std::unique_ptr<AssuanTransaction> takeLastAssuanTransaction();
 
     //
     //
-- 
cgit v1.2.3