aboutsummaryrefslogtreecommitdiffstats
path: root/lang/cpp/src/assuanresult.cpp
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2016-08-23 17:50:01 +0000
committerAndre Heinecke <[email protected]>2016-08-24 12:15:58 +0000
commite20b0f0201543834f15c5d50cd3b2ece69a35d70 (patch)
treef302e7257752d117d534df052186b22fc18743c8 /lang/cpp/src/assuanresult.cpp
parentQt: Adapt (disabled) tofuinfo test to new API (diff)
downloadgpgme-e20b0f0201543834f15c5d50cd3b2ece69a35d70.tar.gz
gpgme-e20b0f0201543834f15c5d50cd3b2ece69a35d70.zip
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 <[email protected]>
Diffstat (limited to 'lang/cpp/src/assuanresult.cpp')
-rw-r--r--lang/cpp/src/assuanresult.cpp90
1 files changed, 0 insertions, 90 deletions
diff --git a/lang/cpp/src/assuanresult.cpp b/lang/cpp/src/assuanresult.cpp
deleted file mode 100644
index 3d6d0a3a..00000000
--- a/lang/cpp/src/assuanresult.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- assuanresult.cpp - wraps a gpgme assuan result
- Copyright (C) 2009 Klarälvdalens Datakonsult AB
-
- This file is part of GPGME++.
-
- GPGME++ is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- GPGME++ is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with GPGME++; see the file COPYING.LIB. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <assuanresult.h>
-#include "result_p.h"
-
-#include <gpgme.h>
-
-#include <istream>
-
-using namespace GpgME;
-
-class AssuanResult::Private
-{
-public:
- explicit Private(const gpgme_assuan_result_t r)
- {
- if (!r) {
- return;
- }
- error = r->err;
- }
-
- gpgme_error_t error;
-};
-
-AssuanResult::AssuanResult(gpgme_ctx_t ctx, int error)
- : Result(error), d()
-{
- init(ctx);
-}
-
-AssuanResult::AssuanResult(gpgme_ctx_t ctx, const Error &error)
- : Result(error), d()
-{
- init(ctx);
-}
-
-void AssuanResult::init(gpgme_ctx_t ctx)
-{
- (void)ctx;
- if (!ctx) {
- return;
- }
- gpgme_assuan_result_t res = gpgme_op_assuan_result(ctx);
- if (!res) {
- return;
- }
- d.reset(new Private(res));
-}
-
-make_standard_stuff(AssuanResult)
-
-Error AssuanResult::assuanError() const
-{
- if (d) {
- return Error(d->error);
- }
- return Error();
-}
-
-std::ostream &GpgME::operator<<(std::ostream &os, const AssuanResult &result)
-{
- os << "GpgME::AssuanResult(";
- if (!result.isNull()) {
- os << "\n error: " << result.error()
- << "\n assuanError: " << result.assuanError()
- << "\n";
- }
- return os << ')';
-}