From 433bb8e84b2d1e50b5c5b9f7f2006b60cd7d7785 Mon Sep 17 00:00:00 2001
From: Andre Heinecke <aheinecke@intevation.de>
Date: Mon, 22 Feb 2016 19:07:41 +0100
Subject: Remove feature check ifdefs

* lang/cpp/src/assuanresult.cpp,
 lang/cpp/src/callbacks.cpp,
 lang/cpp/src/configuration.cpp,
 lang/cpp/src/context.cpp,
 lang/cpp/src/context_glib.cpp,
 lang/cpp/src/context_qt.cpp,
 lang/cpp/src/context_vanilla.cpp,
 lang/cpp/src/data.cpp,
 lang/cpp/src/decryptionresult.cpp,
 lang/cpp/src/defaultassuantransaction.cpp,
 lang/cpp/src/editinteractor.cpp,
 lang/cpp/src/encryptionresult.cpp,
 lang/cpp/src/engineinfo.cpp,
 lang/cpp/src/eventloopinteractor.cpp,
 lang/cpp/src/global.h,
 lang/cpp/src/gpgagentgetinfoassuantransaction.cpp,
 lang/cpp/src/importresult.cpp,
 lang/cpp/src/interfaces/assuantransaction.h,
 lang/cpp/src/key.cpp,
 lang/cpp/src/keygenerationresult.cpp,
 lang/cpp/src/keylistresult.cpp,
 lang/cpp/src/scdgetinfoassuantransaction.cpp,
 lang/cpp/src/signingresult.cpp,
 lang/cpp/src/trustitem.cpp,
 lang/cpp/src/util.h,
 lang/cpp/src/verificationresult.cpp,
 lang/cpp/src/vfsmountresult.cpp: Remove feature checks.
---
 lang/cpp/src/assuanresult.cpp | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'lang/cpp/src/assuanresult.cpp')

diff --git a/lang/cpp/src/assuanresult.cpp b/lang/cpp/src/assuanresult.cpp
index 056aefb3..3d6d0a3a 100644
--- a/lang/cpp/src/assuanresult.cpp
+++ b/lang/cpp/src/assuanresult.cpp
@@ -20,8 +20,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#include <config-gpgme++.h>
-
 #include <assuanresult.h>
 #include "result_p.h"
 
@@ -31,7 +29,6 @@
 
 using namespace GpgME;
 
-#ifdef HAVE_GPGME_ASSUAN_ENGINE
 class AssuanResult::Private
 {
 public:
@@ -45,7 +42,6 @@ public:
 
     gpgme_error_t error;
 };
-#endif
 
 AssuanResult::AssuanResult(gpgme_ctx_t ctx, int error)
     : Result(error), d()
@@ -62,7 +58,6 @@ AssuanResult::AssuanResult(gpgme_ctx_t ctx, const Error &error)
 void AssuanResult::init(gpgme_ctx_t ctx)
 {
     (void)ctx;
-#ifdef HAVE_GPGME_ASSUAN_ENGINE
     if (!ctx) {
         return;
     }
@@ -71,18 +66,15 @@ void AssuanResult::init(gpgme_ctx_t ctx)
         return;
     }
     d.reset(new Private(res));
-#endif
 }
 
 make_standard_stuff(AssuanResult)
 
 Error AssuanResult::assuanError() const
 {
-#ifdef HAVE_GPGME_ASSUAN_ENGINE
     if (d) {
         return Error(d->error);
     }
-#endif
     return Error();
 }
 
-- 
cgit v1.2.3