From 226e51052ae73efa8d9f30729b28de68d35231af Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Sat, 2 Apr 2016 04:31:59 -0800 Subject: Add QGpgME code from libkleo * lang/qt/src/Makefile.am, lang/qt/src/abstractimportjob.h, lang/qt/src/adduseridjob.h, lang/qt/src/changeexpiryjob.h, lang/qt/src/changeownertrustjob.h, lang/qt/src/changepasswdjob.h, lang/qt/src/cryptoconfig.h, lang/qt/src/decryptjob.h, lang/qt/src/decryptverifyjob.h, lang/qt/src/deletejob.h, lang/qt/src/downloadjob.h, lang/qt/src/encryptjob.h, lang/qt/src/exportjob.h, lang/qt/src/hierarchicalkeylistjob.h, lang/qt/src/importfromkeyserverjob.h, lang/qt/src/importjob.h, lang/qt/src/job.cpp, lang/qt/src/job.h, lang/qt/src/keygenerationjob.h, lang/qt/src/keylistjob.h, lang/qt/src/listallkeysjob.h, lang/qt/src/multideletejob.h, lang/qt/src/qgpgmeadduseridjob.cpp, lang/qt/src/qgpgmeadduseridjob.h, lang/qt/src/qgpgmebackend.cpp, lang/qt/src/qgpgmebackend.h, lang/qt/src/qgpgmechangeexpiryjob.cpp, lang/qt/src/qgpgmechangeexpiryjob.h, lang/qt/src/qgpgmechangeownertrustjob.cpp, lang/qt/src/qgpgmechangeownertrustjob.h, lang/qt/src/qgpgmechangepasswdjob.cpp, lang/qt/src/qgpgmechangepasswdjob.h, lang/qt/src/qgpgmecryptoconfig.cpp, lang/qt/src/qgpgmecryptoconfig.h, lang/qt/src/qgpgmedecryptjob.cpp, lang/qt/src/qgpgmedecryptjob.h, lang/qt/src/qgpgmedecryptverifyjob.cpp, lang/qt/src/qgpgmedecryptverifyjob.h, lang/qt/src/qgpgmedeletejob.cpp, lang/qt/src/qgpgmedeletejob.h, lang/qt/src/qgpgmedownloadjob.cpp, lang/qt/src/qgpgmedownloadjob.h, lang/qt/src/qgpgmeencryptjob.cpp, lang/qt/src/qgpgmeencryptjob.h, lang/qt/src/qgpgmeexportjob.cpp, lang/qt/src/qgpgmeexportjob.h, lang/qt/src/qgpgmeimportfromkeyserverjob.cpp, lang/qt/src/qgpgmeimportfromkeyserverjob.h, lang/qt/src/qgpgmeimportjob.cpp, lang/qt/src/qgpgmeimportjob.h, lang/qt/src/qgpgmekeygenerationjob.cpp, lang/qt/src/qgpgmekeygenerationjob.h, lang/qt/src/qgpgmekeylistjob.cpp, lang/qt/src/qgpgmekeylistjob.h, lang/qt/src/qgpgmelistallkeysjob.cpp, lang/qt/src/qgpgmelistallkeysjob.h, lang/qt/src/qgpgmenewcryptoconfig.cpp, lang/qt/src/qgpgmenewcryptoconfig.h, lang/qt/src/qgpgmerefreshkeysjob.cpp, lang/qt/src/qgpgmerefreshkeysjob.h, lang/qt/src/qgpgmesecretkeyexportjob.cpp, lang/qt/src/qgpgmesecretkeyexportjob.h, lang/qt/src/qgpgmesignencryptjob.cpp, lang/qt/src/qgpgmesignencryptjob.h, lang/qt/src/qgpgmesignjob.cpp, lang/qt/src/qgpgmesignjob.h, lang/qt/src/qgpgmesignkeyjob.cpp, lang/qt/src/qgpgmesignkeyjob.h, lang/qt/src/qgpgmeverifydetachedjob.cpp, lang/qt/src/qgpgmeverifydetachedjob.h, lang/qt/src/qgpgmeverifyopaquejob.cpp, lang/qt/src/qgpgmeverifyopaquejob.h, lang/qt/src/refreshkeysjob.h, lang/qt/src/signencryptjob.h, lang/qt/src/signjob.h, lang/qt/src/signkeyjob.h, lang/qt/src/specialjob.h, lang/qt/src/threadedjobmixin.cpp, lang/qt/src/threadedjobmixin.h, lang/qt/src/verifydetachedjob.h, lang/qt/src/verifyopaquejob.h: New. * lang/qt/src/Makefile.am: -- The ShowErrorMessage calls were removed and are to be replaced by error signals / error status which the UI should then handle. This allowed to port away from KMessageBox and KLocalizedstring. Additionally this removed the old process bases qgpgmeconfigdialog, and GnuPGProcessBase. Classes using GnuPGProcessbase were changed to KProcess api. This is a first compiling version. API is subject to change to resolve the split between base jobs and qgpgme classes. --- lang/qt/src/qgpgmenewcryptoconfig.h | 192 ++++++++++++++++++++++++++++++++++++ 1 file changed, 192 insertions(+) create mode 100644 lang/qt/src/qgpgmenewcryptoconfig.h (limited to 'lang/qt/src/qgpgmenewcryptoconfig.h') diff --git a/lang/qt/src/qgpgmenewcryptoconfig.h b/lang/qt/src/qgpgmenewcryptoconfig.h new file mode 100644 index 00000000..0afe3811 --- /dev/null +++ b/lang/qt/src/qgpgmenewcryptoconfig.h @@ -0,0 +1,192 @@ +/* + qgpgmenewcryptoconfig.h + + This file is part of qgpgme, the Qt API binding for gpgme + Copyright (c) 2010 Klarälvdalens Datakonsult AB + Copyright (c) 2016 Intevation GmbH + + Libkleopatra is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + Libkleopatra 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 + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + In addition, as a special exception, the copyright holders give + permission to link the code of this program with any edition of + the Qt library by Trolltech AS, Norway (or with modified versions + of Qt that use the same license as Qt), and distribute linked + combinations including the two. You must obey the GNU General + Public License in all respects for all of the code used other than + Qt. If you modify this file, you may extend this exception to + your version of the file, but you are not obligated to do so. If + you do not wish to do so, delete this exception statement from + your version. +*/ + +#ifndef QGPGME_QGPGMENEWCRYPTOCONFIG_H +#define QGPGME_QGPGMENEWCRYPTOCONFIG_H + +#include "qgpgme_export.h" +#include "cryptoconfig.h" + +#include +#include +#include + +#ifdef BUILDING_QGPGME +# include "configuration.h" +#else +# include +#endif + +#include +#include +#include + +#include +#include + +class QGpgMENewCryptoConfig; +class QGpgMENewCryptoConfigComponent; +class QGpgMENewCryptoConfigGroup; +class QGpgMENewCryptoConfigEntry; + +class QGpgMENewCryptoConfigEntry : public QGpgME::CryptoConfigEntry +{ +public: + QGpgMENewCryptoConfigEntry(const boost::shared_ptr &group, const GpgME::Configuration::Option &option); + ~QGpgMENewCryptoConfigEntry(); + + QString name() const Q_DECL_OVERRIDE; + QString description() const Q_DECL_OVERRIDE; + QString path() const Q_DECL_OVERRIDE; + bool isOptional() const Q_DECL_OVERRIDE; + bool isReadOnly() const Q_DECL_OVERRIDE; + bool isList() const Q_DECL_OVERRIDE; + bool isRuntime() const Q_DECL_OVERRIDE; + Level level() const Q_DECL_OVERRIDE; + ArgType argType() const Q_DECL_OVERRIDE; + bool isSet() const Q_DECL_OVERRIDE; + bool boolValue() const Q_DECL_OVERRIDE; + QString stringValue() const Q_DECL_OVERRIDE; + int intValue() const Q_DECL_OVERRIDE; + unsigned int uintValue() const Q_DECL_OVERRIDE; + QUrl urlValue() const Q_DECL_OVERRIDE; + unsigned int numberOfTimesSet() const Q_DECL_OVERRIDE; + std::vector intValueList() const Q_DECL_OVERRIDE; + std::vector uintValueList() const Q_DECL_OVERRIDE; + QList urlValueList() const Q_DECL_OVERRIDE; + void resetToDefault() Q_DECL_OVERRIDE; + void setBoolValue(bool) Q_DECL_OVERRIDE; + void setStringValue(const QString &) Q_DECL_OVERRIDE; + void setIntValue(int) Q_DECL_OVERRIDE; + void setUIntValue(unsigned int) Q_DECL_OVERRIDE; + void setURLValue(const QUrl &) Q_DECL_OVERRIDE; + void setNumberOfTimesSet(unsigned int) Q_DECL_OVERRIDE; + void setIntValueList(const std::vector &) Q_DECL_OVERRIDE; + void setUIntValueList(const std::vector &) Q_DECL_OVERRIDE; + void setURLValueList(const QList &) Q_DECL_OVERRIDE; + bool isDirty() const Q_DECL_OVERRIDE; + +#if 0 + void setDirty(bool b); + QString outputString() const; + +protected: + bool isStringType() const; + QVariant stringToValue(const QString &value, bool unescape) const; + QString toString(bool escape) const; +#endif +private: + boost::weak_ptr m_group; + GpgME::Configuration::Option m_option; +}; + +class QGpgMENewCryptoConfigGroup : public QGpgME::CryptoConfigGroup +{ +public: + QGpgMENewCryptoConfigGroup(const boost::shared_ptr &parent, const GpgME::Configuration::Option &option); + ~QGpgMENewCryptoConfigGroup(); + + QString name() const Q_DECL_OVERRIDE; + QString iconName() const Q_DECL_OVERRIDE + { + return QString(); + } + QString description() const Q_DECL_OVERRIDE; + QString path() const Q_DECL_OVERRIDE; + QGpgME::CryptoConfigEntry::Level level() const Q_DECL_OVERRIDE; + QStringList entryList() const Q_DECL_OVERRIDE; + QGpgMENewCryptoConfigEntry *entry(const QString &name) const Q_DECL_OVERRIDE; + +private: + friend class QGpgMENewCryptoConfigComponent; // it adds the entries + boost::weak_ptr m_component; + GpgME::Configuration::Option m_option; + QStringList m_entryNames; + QHash< QString, boost::shared_ptr > m_entriesByName; +}; + +/// For docu, see kleo/cryptoconfig.h +class QGpgMENewCryptoConfigComponent : public QGpgME::CryptoConfigComponent, public boost::enable_shared_from_this +{ +public: + QGpgMENewCryptoConfigComponent(); + ~QGpgMENewCryptoConfigComponent(); + + void setComponent(const GpgME::Configuration::Component &component); + + QString name() const Q_DECL_OVERRIDE; + QString iconName() const Q_DECL_OVERRIDE + { + return name(); + } + QString description() const Q_DECL_OVERRIDE; + QStringList groupList() const Q_DECL_OVERRIDE; + QGpgMENewCryptoConfigGroup *group(const QString &name) const Q_DECL_OVERRIDE; + + void sync(bool runtime); + +private: + GpgME::Configuration::Component m_component; + QHash< QString, boost::shared_ptr > m_groupsByName; +}; + +/** + * CryptoConfig implementation around the gpgconf command-line tool + * For method docu, see kleo/cryptoconfig.h + */ +class QGPGME_EXPORT QGpgMENewCryptoConfig : public QGpgME::CryptoConfig +{ +public: + /** + * Constructor + */ + QGpgMENewCryptoConfig(); + ~QGpgMENewCryptoConfig(); + + QStringList componentList() const Q_DECL_OVERRIDE; + + QGpgMENewCryptoConfigComponent *component(const QString &name) const Q_DECL_OVERRIDE; + + void clear() Q_DECL_OVERRIDE; + void sync(bool runtime) Q_DECL_OVERRIDE; + +private: + /// @param showErrors if true, a messagebox will be shown if e.g. gpgconf wasn't found + void reloadConfiguration(bool showErrors); + +private: + QHash< QString, boost::shared_ptr > m_componentsByName; + bool m_parsed; +}; + +#endif /* QGPGME_QGPGMENEWCRYPTOCONFIG_H */ -- cgit v1.2.3 From f98898ab1a6952e0c3a5d235963a27eba2e19e46 Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Sun, 3 Apr 2016 04:52:16 -0800 Subject: Cpp / Qt: Reduce boost usage (memory and tuple) * cpp/src/assuanresult.h, cpp/src/configuration.cpp, cpp/src/configuration.h, cpp/src/data.h, cpp/src/decryptionresult.h, cpp/src/defaultassuantransaction.cpp, cpp/src/encryptionresult.cpp, cpp/src/encryptionresult.h, cpp/src/engineinfo.h, cpp/src/gpgagentgetinfoassuantransaction.cpp, cpp/src/gpgsignkeyeditinteractor.cpp, cpp/src/importresult.cpp, cpp/src/importresult.h, cpp/src/key.h, cpp/src/keygenerationresult.h, cpp/src/keylistresult.h, cpp/src/notation.h, cpp/src/signingresult.cpp, cpp/src/signingresult.h, cpp/src/verificationresult.cpp, cpp/src/verificationresult.h, cpp/src/vfsmountresult.h, qt/src/dataprovider.cpp, qt/src/dataprovider.h, qt/src/decryptjob.h, qt/src/decryptverifyjob.h, qt/src/downloadjob.h, qt/src/encryptjob.h, qt/src/qgpgmeadduseridjob.cpp, qt/src/qgpgmechangeexpiryjob.cpp, qt/src/qgpgmechangeownertrustjob.cpp, qt/src/qgpgmechangepasswdjob.cpp, qt/src/qgpgmedecryptjob.cpp, qt/src/qgpgmedecryptjob.h, qt/src/qgpgmedecryptverifyjob.cpp, qt/src/qgpgmedecryptverifyjob.h, qt/src/qgpgmedeletejob.cpp, qt/src/qgpgmedownloadjob.cpp, qt/src/qgpgmedownloadjob.h, qt/src/qgpgmeencryptjob.cpp, qt/src/qgpgmeencryptjob.h, qt/src/qgpgmeexportjob.cpp, qt/src/qgpgmeexportjob.h, qt/src/qgpgmeimportfromkeyserverjob.cpp, qt/src/qgpgmeimportfromkeyserverjob.h, qt/src/qgpgmeimportjob.cpp, qt/src/qgpgmeimportjob.h, qt/src/qgpgmekeygenerationjob.cpp, qt/src/qgpgmekeygenerationjob.h, qt/src/qgpgmekeylistjob.cpp, qt/src/qgpgmekeylistjob.h, qt/src/qgpgmelistallkeysjob.cpp, qt/src/qgpgmelistallkeysjob.h, qt/src/qgpgmenewcryptoconfig.cpp, qt/src/qgpgmenewcryptoconfig.h, qt/src/qgpgmesignencryptjob.cpp, qt/src/qgpgmesignencryptjob.h, qt/src/qgpgmesignjob.cpp, qt/src/qgpgmesignjob.h, qt/src/qgpgmesignkeyjob.cpp, qt/src/qgpgmeverifydetachedjob.cpp, qt/src/qgpgmeverifydetachedjob.h, qt/src/qgpgmeverifyopaquejob.cpp, qt/src/qgpgmeverifyopaquejob.h, qt/src/signencryptjob.h, qt/src/signjob.h, qt/src/threadedjobmixin.h, qt/src/verifydetachedjob.h, qt/src/verifyopaquejob.h: Reduce boost usage. -- This was mostly done with search and replace to change the templates / classes from memory and tuple to their c++11 equivalents. --- lang/qt/src/qgpgmenewcryptoconfig.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lang/qt/src/qgpgmenewcryptoconfig.h') diff --git a/lang/qt/src/qgpgmenewcryptoconfig.h b/lang/qt/src/qgpgmenewcryptoconfig.h index 0afe3811..be184ac9 100644 --- a/lang/qt/src/qgpgmenewcryptoconfig.h +++ b/lang/qt/src/qgpgmenewcryptoconfig.h @@ -62,7 +62,7 @@ class QGpgMENewCryptoConfigEntry; class QGpgMENewCryptoConfigEntry : public QGpgME::CryptoConfigEntry { public: - QGpgMENewCryptoConfigEntry(const boost::shared_ptr &group, const GpgME::Configuration::Option &option); + QGpgMENewCryptoConfigEntry(const std::shared_ptr &group, const GpgME::Configuration::Option &option); ~QGpgMENewCryptoConfigEntry(); QString name() const Q_DECL_OVERRIDE; @@ -106,14 +106,14 @@ protected: QString toString(bool escape) const; #endif private: - boost::weak_ptr m_group; + std::weak_ptr m_group; GpgME::Configuration::Option m_option; }; class QGpgMENewCryptoConfigGroup : public QGpgME::CryptoConfigGroup { public: - QGpgMENewCryptoConfigGroup(const boost::shared_ptr &parent, const GpgME::Configuration::Option &option); + QGpgMENewCryptoConfigGroup(const std::shared_ptr &parent, const GpgME::Configuration::Option &option); ~QGpgMENewCryptoConfigGroup(); QString name() const Q_DECL_OVERRIDE; @@ -129,14 +129,14 @@ public: private: friend class QGpgMENewCryptoConfigComponent; // it adds the entries - boost::weak_ptr m_component; + std::weak_ptr m_component; GpgME::Configuration::Option m_option; QStringList m_entryNames; - QHash< QString, boost::shared_ptr > m_entriesByName; + QHash< QString, std::shared_ptr > m_entriesByName; }; /// For docu, see kleo/cryptoconfig.h -class QGpgMENewCryptoConfigComponent : public QGpgME::CryptoConfigComponent, public boost::enable_shared_from_this +class QGpgMENewCryptoConfigComponent : public QGpgME::CryptoConfigComponent, public std::enable_shared_from_this { public: QGpgMENewCryptoConfigComponent(); @@ -157,7 +157,7 @@ public: private: GpgME::Configuration::Component m_component; - QHash< QString, boost::shared_ptr > m_groupsByName; + QHash< QString, std::shared_ptr > m_groupsByName; }; /** @@ -185,7 +185,7 @@ private: void reloadConfiguration(bool showErrors); private: - QHash< QString, boost::shared_ptr > m_componentsByName; + QHash< QString, std::shared_ptr > m_componentsByName; bool m_parsed; }; -- cgit v1.2.3 From afd8fad6e275e2f74b2ad045dce05d826986e2ec Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Mon, 11 Apr 2016 17:15:16 +0200 Subject: Qt: Remove remaining boost usage * lang/qt/src/dataprovider.h, lang/qt/src/decryptjob.h, lang/qt/src/decryptverifyjob.h, lang/qt/src/encryptjob.h, lang/qt/src/qgpgmeadduseridjob.cpp, lang/qt/src/qgpgmechangeexpiryjob.cpp, lang/qt/src/qgpgmechangeownertrustjob.cpp, lang/qt/src/qgpgmechangepasswdjob.cpp, lang/qt/src/qgpgmedecryptjob.cpp, lang/qt/src/qgpgmedecryptverifyjob.cpp, lang/qt/src/qgpgmedeletejob.cpp, lang/qt/src/qgpgmedownloadjob.cpp, lang/qt/src/qgpgmeencryptjob.cpp, lang/qt/src/qgpgmeexportjob.cpp, lang/qt/src/qgpgmeimportfromkeyserverjob.cpp, lang/qt/src/qgpgmeimportjob.cpp, lang/qt/src/qgpgmekeygenerationjob.cpp, lang/qt/src/qgpgmekeylistjob.cpp, lang/qt/src/qgpgmenewcryptoconfig.cpp, lang/qt/src/qgpgmenewcryptoconfig.h, lang/qt/src/qgpgmesignencryptjob.cpp, lang/qt/src/qgpgmesignjob.cpp, lang/qt/src/qgpgmesignkeyjob.cpp, lang/qt/src/qgpgmeverifydetachedjob.cpp, lang/qt/src/qgpgmeverifyopaquejob.cpp, lang/qt/src/signencryptjob.h, lang/qt/src/signjob.h, lang/qt/src/threadedjobmixin.cpp, lang/qt/src/threadedjobmixin.h, lang/qt/src/verifydetachedjob.h, lang/qt/src/verifyopaquejob.h: Remove boost usage. -- Mostly done with search and replace. --- lang/qt/src/qgpgmenewcryptoconfig.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'lang/qt/src/qgpgmenewcryptoconfig.h') diff --git a/lang/qt/src/qgpgmenewcryptoconfig.h b/lang/qt/src/qgpgmenewcryptoconfig.h index be184ac9..03915d4e 100644 --- a/lang/qt/src/qgpgmenewcryptoconfig.h +++ b/lang/qt/src/qgpgmenewcryptoconfig.h @@ -47,9 +47,6 @@ # include #endif -#include -#include -#include #include #include -- cgit v1.2.3 From 20b02a7dd49c7ede148245d8a5319b2ba9ce7673 Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Fri, 6 May 2016 14:20:45 +0200 Subject: Qt: Fix library name in Copyright headers -- Files are not part of libkleopatra anymore. --- lang/qt/src/qgpgmenewcryptoconfig.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lang/qt/src/qgpgmenewcryptoconfig.h') diff --git a/lang/qt/src/qgpgmenewcryptoconfig.h b/lang/qt/src/qgpgmenewcryptoconfig.h index 03915d4e..81b4cb44 100644 --- a/lang/qt/src/qgpgmenewcryptoconfig.h +++ b/lang/qt/src/qgpgmenewcryptoconfig.h @@ -5,12 +5,12 @@ Copyright (c) 2010 Klarälvdalens Datakonsult AB Copyright (c) 2016 Intevation GmbH - Libkleopatra is free software; you can redistribute it and/or + QGpgME is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - Libkleopatra is distributed in the hope that it will be useful, + QGpgME 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 General Public License for more details. -- cgit v1.2.3