From e20b0f0201543834f15c5d50cd3b2ece69a35d70 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 23 Aug 2016 19:50:01 +0200 Subject: cpp: Get rid of AssuanResult due to its deprecation. * lang/cpp/src/assuanresult.cpp: Remove. * lang/cpp/src/assuanresult.h: Remove. * lang/cpp/src/Makefile.am: Remove these files. * lang/cpp/src/context.cpp: Remove header assuanresult.h (assuanTransact): Change return type to Error. Use gpgme_op_assuan_transact_ext. (startAssuanTransaction): Change return type to Error. (assuanResult): Remove * lang/cpp/src/context.h (assuanResult): Adjust for changes. Signed-off-by: Werner Koch --- lang/cpp/src/context.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'lang/cpp/src/context.h') diff --git a/lang/cpp/src/context.h b/lang/cpp/src/context.h index 29eba91b..6518d4cf 100644 --- a/lang/cpp/src/context.h +++ b/lang/cpp/src/context.h @@ -46,7 +46,6 @@ class EventLoopInteractor; class EditInteractor; class AssuanTransaction; -class AssuanResult; class KeyListResult; class KeyGenerationResult; class ImportResult; @@ -240,11 +239,10 @@ public: // Assuan Transactions // - AssuanResult assuanTransact(const char *command, std::unique_ptr transaction); - AssuanResult assuanTransact(const char *command); + GpgME::Error assuanTransact(const char *command, std::unique_ptr transaction); + GpgME::Error assuanTransact(const char *command); GpgME::Error startAssuanTransaction(const char *command, std::unique_ptr transaction); GpgME::Error startAssuanTransaction(const char *command); - AssuanResult assuanResult() const; AssuanTransaction *lastAssuanTransaction() const; std::unique_ptr takeLastAssuanTransaction(); -- cgit v1.2.3