diff --git a/lang/qt/src/encryptjob.h b/lang/qt/src/encryptjob.h index 161a7694..937ee8d6 100644 --- a/lang/qt/src/encryptjob.h +++ b/lang/qt/src/encryptjob.h @@ -1,137 +1,137 @@ /* encryptjob.h This file is part of qgpgme, the Qt API binding for gpgme Copyright (c) 2004, 2007 Klarälvdalens Datakonsult AB Copyright (c) 2016 by Bundesamt für Sicherheit in der Informationstechnik Software engineering by Intevation GmbH 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. 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. 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 __KLEO_ENCRYPTJOB_H__ #define __KLEO_ENCRYPTJOB_H__ #include "job.h" #include #include #ifdef BUILDING_QGPGME # include "context.h" #else # include #endif class QByteArray; class QIODevice; namespace GpgME { class Error; class Key; class EncryptionResult; } namespace QGpgME { /** @short An abstract base class for asynchronous encrypters To use a EncryptJob, first obtain an instance from the CryptoBackend implementation, connect the progress() and result() signals to suitable slots and then start the encryption with a call to start(). This call might fail, in which case the EncryptJob instance will have scheduled it's own destruction with a call to QObject::deleteLater(). After result() is emitted, the EncryptJob will schedule it's own destruction by calling QObject::deleteLater(). */ class QGPGME_EXPORT EncryptJob : public Job { Q_OBJECT protected: explicit EncryptJob(QObject *parent); public: ~EncryptJob(); /** Starts the encryption operation. \a recipients is the a list of keys to encrypt \a plainText to. Empty (null) keys are ignored. If \a recipients is empty, performs symmetric (passphrase) encryption. If \a alwaysTrust is true, validity checking for the keys will not be performed, but full validity assumed for all keys without further checks. */ - virtual QGPGME_DEPRECATED_EXPORT GpgME::Error start(const std::vector &recipients, + virtual GpgME::Error start(const std::vector &recipients, const QByteArray &plainText, bool alwaysTrust = false) = 0; /*! \overload If \a cipherText is non-null, the ciphertext is written there. Otherwise, it will be delivered in the second argument of result(). \throws GpgME::Exception if starting fails */ virtual void start(const std::vector &recipients, const std::shared_ptr &plainText, const std::shared_ptr &cipherText = std::shared_ptr(), bool alwaysTrust = false) = 0; virtual GpgME::EncryptionResult exec(const std::vector &recipients, const QByteArray &plainText, bool alwaysTrust, QByteArray &cipherText) = 0; /*! This is a hack to request BASE64 output (instead of whatever comes out normally). */ virtual void setOutputIsBase64Encoded(bool) = 0; /** Like start but with an additional argument for EncryptionFlags for * more flexibility. */ virtual void start(const std::vector &recipients, const std::shared_ptr &plainText, const std::shared_ptr &cipherText = std::shared_ptr(), const GpgME::Context::EncryptionFlags flags = GpgME::Context::None) = 0; /** Like exec but with an additional argument for EncryptionFlags for * more flexibility. */ virtual GpgME::EncryptionResult exec(const std::vector &recipients, const QByteArray &plainText, const GpgME::Context::EncryptionFlags flags, QByteArray &cipherText) = 0; Q_SIGNALS: void result(const GpgME::EncryptionResult &result, const QByteArray &cipherText, const QString &auditLogAsHtml = QString(), const GpgME::Error &auditLogError = GpgME::Error()); }; } #endif // __KLEO_ENCRYPTJOB_H__ diff --git a/lang/qt/src/signjob.h b/lang/qt/src/signjob.h index b5b5af6f..57d2d17b 100644 --- a/lang/qt/src/signjob.h +++ b/lang/qt/src/signjob.h @@ -1,123 +1,123 @@ /* signjob.h This file is part of qgpgme, the Qt API binding for gpgme Copyright (c) 2004, 2007 Klarälvdalens Datakonsult AB Copyright (c) 2016 by Bundesamt für Sicherheit in der Informationstechnik Software engineering by Intevation GmbH 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. 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. 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 __KLEO_SIGNJOB_H__ #define __KLEO_SIGNJOB_H__ #include "job.h" #ifdef BUILDING_QGPGME # include "global.h" #else # include #endif #include #include class QByteArray; class QIODevice; namespace GpgME { class Error; class Key; class SigningResult; } namespace QGpgME { /** @short An abstract base class for asynchronous signing To use a SignJob, first obtain an instance from the CryptoBackend implementation, connect the progress() and result() signals to suitable slots and then start the signing with a call to start(). This call might fail, in which case the SignJob instance will have scheduled it's own destruction with a call to QObject::deleteLater(). After result() is emitted, the SignJob will schedule it's own destruction by calling QObject::deleteLater(). */ class QGPGME_EXPORT SignJob : public Job { Q_OBJECT protected: explicit SignJob(QObject *parent); public: ~SignJob(); /** Starts the signing operation. \a signers is the list of keys to sign \a plainText with. Empty (null) keys are ignored. */ - virtual QGPGME_DEPRECATED_EXPORT GpgME::Error start(const std::vector &signers, + virtual GpgME::Error start(const std::vector &signers, const QByteArray &plainText, GpgME::SignatureMode mode) = 0; /*! \overload If \a signature is non-null the signature is written there. Otherwise, it will be delivered in the second argument of result(). \throws GpgME::Exception if starting fails */ virtual void start(const std::vector &signers, const std::shared_ptr &plainText, const std::shared_ptr &signature, GpgME::SignatureMode mode) = 0; virtual GpgME::SigningResult exec(const std::vector &signers, const QByteArray &plainText, GpgME::SignatureMode mode, QByteArray &signature) = 0; /*! This is a hack to request BASE64 output (instead of whatever comes out normally). */ virtual void setOutputIsBase64Encoded(bool) = 0; Q_SIGNALS: void result(const GpgME::SigningResult &result, const QByteArray &signature, const QString &auditLogAsHtml = QString(), const GpgME::Error &auditLogError = GpgME::Error()); }; } #endif // __KLEO_SIGNJOB_H__