From 7071b2a9c00b85d434d01b6166269ebf48b01b81 Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Sun, 3 Apr 2016 01:22:19 -0800 Subject: Qt: Only use GpgME based config class * lang/qt/src/qgpgmecryptoconfig.cpp, lang/qt/src/qgpgmecryptoconfig.h: Removed. * lang/qt/src/qgpgmebackend.cpp: Return newcryptoconfig. -- The GpgME based config class is the way forward and the old class was using KDE Code. Probably needs some bugfixes as previously the new class was only used for Windows CE --- lang/qt/src/qgpgmebackend.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'lang/qt/src/qgpgmebackend.cpp') diff --git a/lang/qt/src/qgpgmebackend.cpp b/lang/qt/src/qgpgmebackend.cpp index ac771241..1167daee 100644 --- a/lang/qt/src/qgpgmebackend.cpp +++ b/lang/qt/src/qgpgmebackend.cpp @@ -33,7 +33,6 @@ #include "qgpgmebackend.h" -#include "qgpgmecryptoconfig.h" #include "qgpgmenewcryptoconfig.h" #include "qgpgmekeygenerationjob.h" @@ -408,14 +407,9 @@ QString QGpgME::QGpgMEBackend::displayName() const QGpgME::CryptoConfig *QGpgME::QGpgMEBackend::config() const { if (!mCryptoConfig) { -#ifdef _WIN32_WCE // for now... if (GpgME::hasFeature(GpgME::GpgConfEngineFeature, 0)) { mCryptoConfig = new QGpgMENewCryptoConfig; - } else -#endif - if (!QGpgMECryptoConfig::gpgConfPath().isEmpty()) { - mCryptoConfig = new QGpgMECryptoConfig(); - } + } } return mCryptoConfig; } -- cgit v1.2.3