GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt: Replace Q_DECL_OVERRIDE with override

Browse Source 
* lang/qt/src/defaultkeygenerationjob.h,
lang/qt/src/hierarchicalkeylistjob.h, lang/qt/src/multideletejob.h,
lang/qt/src/protocol_p.h, lang/qt/src/qgpgmeadduseridjob.h,
lang/qt/src/qgpgmechangeexpiryjob.h,
lang/qt/src/qgpgmechangeownertrustjob.h,
lang/qt/src/qgpgmechangepasswdjob.h, lang/qt/src/qgpgmedecryptjob.h,
lang/qt/src/qgpgmedecryptverifyjob.h, lang/qt/src/qgpgmedeletejob.h,
lang/qt/src/qgpgmedownloadjob.h, lang/qt/src/qgpgmeencryptjob.h,
lang/qt/src/qgpgmeexportjob.h, lang/qt/src/qgpgmegpgcardjob.h,
lang/qt/src/qgpgmeimportfromkeyserverjob.h,
lang/qt/src/qgpgmeimportjob.h, lang/qt/src/qgpgmekeyformailboxjob.h,
lang/qt/src/qgpgmekeygenerationjob.h, lang/qt/src/qgpgmekeylistjob.h,
lang/qt/src/qgpgmelistallkeysjob.h, lang/qt/src/qgpgmenewcryptoconfig.h,
lang/qt/src/qgpgmequickjob.h, lang/qt/src/qgpgmerefreshsmimekeysjob.h,
lang/qt/src/qgpgmesignencryptjob.h, lang/qt/src/qgpgmesignjob.h,
lang/qt/src/qgpgmesignkeyjob.h, lang/qt/src/qgpgmetofupolicyjob.h,
lang/qt/src/qgpgmeverifydetachedjob.h,
lang/qt/src/qgpgmeverifyopaquejob.h, lang/qt/src/qgpgmewkdlookupjob.h,
lang/qt/src/qgpgmewkspublishjob.h, lang/qt/src/threadedjobmixin.h,
lang/qt/tests/t-support.h: Replace Q_DECL_OVERRIDE with override
--

We require C++11 since a long time.
This commit is contained in:
Ingo Klöcker 2023-01-05 18:02:17 +01:00
parent 398375a0ab
commit e16c368758
No known key found for this signature in database
GPG Key ID: F5A5D1692277A1E9
34 changed files with 180 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lang/qt/src/defaultkeygenerationjob.h
View File

@ -54,19 +54,19 @@ public:
GpgME::Error start(const QString &email, const QString &name); GpgME::Error start(const QString &email, const QString &name);
QString auditLogAsHtml() const Q_DECL_OVERRIDE; QString auditLogAsHtml() const override;
GpgME::Error auditLogError() const Q_DECL_OVERRIDE; GpgME::Error auditLogError() const override;
public Q_SLOTS: public Q_SLOTS:
void slotCancel() Q_DECL_OVERRIDE; void slotCancel() override;
Q_SIGNALS: Q_SIGNALS:
void result(const GpgME::KeyGenerationResult &result, const QByteArray &pubkeyData, void result(const GpgME::KeyGenerationResult &result, const QByteArray &pubkeyData,
const QString &auditLogAsHtml, const GpgME::Error &auditLogError); const QString &auditLogAsHtml, const GpgME::Error &auditLogError);
protected: protected:
bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; bool eventFilter(QObject *watched, QEvent *event) override;
private: private:
class Private; class Private;

6
lang/qt/src/hierarchicalkeylistjob.h
View File

@ -94,16 +94,16 @@ public:
The \a secretOnly parameter is ignored by The \a secretOnly parameter is ignored by
HierarchicalKeyListJob and must be set to false. HierarchicalKeyListJob and must be set to false.
*/ */
GpgME::Error start(const QStringList &patterns, bool secretOnly = false) Q_DECL_OVERRIDE; GpgME::Error start(const QStringList &patterns, bool secretOnly = false) override;
GpgME::KeyListResult exec(const QStringList &patterns, bool secretOnly, GpgME::KeyListResult exec(const QStringList &patterns, bool secretOnly,
std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE; std::vector<GpgME::Key> &keys) override;
private Q_SLOTS: private Q_SLOTS:
void slotResult(const GpgME::KeyListResult &); void slotResult(const GpgME::KeyListResult &);
void slotNextKey(const GpgME::Key &key); void slotNextKey(const GpgME::Key &key);
/* from Job */ /* from Job */
void slotCancel() Q_DECL_OVERRIDE; void slotCancel() override;
private: private:
GpgME::Error startAJob(); GpgME::Error startAJob();

2
lang/qt/src/multideletejob.h
View File

@ -84,7 +84,7 @@ public:
GpgME::Error start(const std::vector<GpgME::Key> &keys, bool allowSecretKeyDeletion = false); GpgME::Error start(const std::vector<GpgME::Key> &keys, bool allowSecretKeyDeletion = false);
/* from Job */ /* from Job */
void slotCancel() Q_DECL_OVERRIDE; void slotCancel() override;
Q_SIGNALS: Q_SIGNALS:
void result(const GpgME::Error &result, const GpgME::Key &errorKey); void result(const GpgME::Error &result, const GpgME::Key &errorKey);

66
lang/qt/src/protocol_p.h
View File

@ -77,7 +77,7 @@ class Protocol : public QGpgME::Protocol
public: public:
explicit Protocol(GpgME::Protocol proto) : mProtocol(proto) {} explicit Protocol(GpgME::Protocol proto) : mProtocol(proto) {}
QString name() const Q_DECL_OVERRIDE QString name() const override
{ {
switch (mProtocol) { switch (mProtocol) {
case GpgME::OpenPGP: return QStringLiteral("OpenPGP"); case GpgME::OpenPGP: return QStringLiteral("OpenPGP");
@ -86,7 +86,7 @@ public:
} }
} }
QString displayName() const Q_DECL_OVERRIDE QString displayName() const override
{ {
// ah (2.4.16): Where is this used and isn't this inverted // ah (2.4.16): Where is this used and isn't this inverted
// with name // with name
@ -97,12 +97,12 @@ public:
} }
} }
QGpgME::SpecialJob *specialJob(const char *, const QMap<QString, QVariant> &) const Q_DECL_OVERRIDE QGpgME::SpecialJob *specialJob(const char *, const QMap<QString, QVariant> &) const override
{ {
return nullptr; return nullptr;
} }
QGpgME::KeyListJob *keyListJob(bool remote, bool includeSigs, bool validate) const Q_DECL_OVERRIDE QGpgME::KeyListJob *keyListJob(bool remote, bool includeSigs, bool validate) const override
{ {
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol); GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) { if (!context) {
@ -127,7 +127,7 @@ public:
return new QGpgME::QGpgMEKeyListJob(context); return new QGpgME::QGpgMEKeyListJob(context);
} }
QGpgME::ListAllKeysJob *listAllKeysJob(bool includeSigs, bool validate) const Q_DECL_OVERRIDE QGpgME::ListAllKeysJob *listAllKeysJob(bool includeSigs, bool validate) const override
{ {
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol); GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) { if (!context) {
@ -154,7 +154,7 @@ public:
return new QGpgME::QGpgMEListAllKeysJob(context); return new QGpgME::QGpgMEListAllKeysJob(context);
} }
QGpgME::EncryptJob *encryptJob(bool armor, bool textmode) const Q_DECL_OVERRIDE QGpgME::EncryptJob *encryptJob(bool armor, bool textmode) const override
{ {
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol); GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) { if (!context) {
@ -166,7 +166,7 @@ public:
return new QGpgME::QGpgMEEncryptJob(context); return new QGpgME::QGpgMEEncryptJob(context);
} }
QGpgME::DecryptJob *decryptJob() const Q_DECL_OVERRIDE QGpgME::DecryptJob *decryptJob() const override
{ {
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol); GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) { if (!context) {
@ -175,7 +175,7 @@ public:
return new QGpgME::QGpgMEDecryptJob(context); return new QGpgME::QGpgMEDecryptJob(context);
} }
QGpgME::SignJob *signJob(bool armor, bool textMode) const Q_DECL_OVERRIDE QGpgME::SignJob *signJob(bool armor, bool textMode) const override
{ {
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol); GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) { if (!context) {
@ -187,7 +187,7 @@ public:
return new QGpgME::QGpgMESignJob(context); return new QGpgME::QGpgMESignJob(context);
} }
QGpgME::VerifyDetachedJob *verifyDetachedJob(bool textMode) const Q_DECL_OVERRIDE QGpgME::VerifyDetachedJob *verifyDetachedJob(bool textMode) const override
{ {
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol); GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) { if (!context) {
@ -198,7 +198,7 @@ public:
return new QGpgME::QGpgMEVerifyDetachedJob(context); return new QGpgME::QGpgMEVerifyDetachedJob(context);
} }
QGpgME::VerifyOpaqueJob *verifyOpaqueJob(bool textMode) const Q_DECL_OVERRIDE QGpgME::VerifyOpaqueJob *verifyOpaqueJob(bool textMode) const override
{ {
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol); GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) { if (!context) {
@ -209,7 +209,7 @@ public:
return new QGpgME::QGpgMEVerifyOpaqueJob(context); return new QGpgME::QGpgMEVerifyOpaqueJob(context);
} }
QGpgME::KeyGenerationJob *keyGenerationJob() const Q_DECL_OVERRIDE QGpgME::KeyGenerationJob *keyGenerationJob() const override
{ {
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol); GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) { if (!context) {
@ -218,7 +218,7 @@ public:
return new QGpgME::QGpgMEKeyGenerationJob(context); return new QGpgME::QGpgMEKeyGenerationJob(context);
} }
QGpgME::ImportJob *importJob() const Q_DECL_OVERRIDE QGpgME::ImportJob *importJob() const override
{ {
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol); GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) { if (!context) {
@ -227,7 +227,7 @@ public:
return new QGpgME::QGpgMEImportJob(context); return new QGpgME::QGpgMEImportJob(context);
} }
QGpgME::ImportFromKeyserverJob *importFromKeyserverJob() const Q_DECL_OVERRIDE QGpgME::ImportFromKeyserverJob *importFromKeyserverJob() const override
{ {
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol); GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) { if (!context) {
@ -249,7 +249,7 @@ public:
return new QGpgME::QGpgMEReceiveKeysJob{context}; return new QGpgME::QGpgMEReceiveKeysJob{context};
} }
QGpgME::ExportJob *publicKeyExportJob(bool armor) const Q_DECL_OVERRIDE QGpgME::ExportJob *publicKeyExportJob(bool armor) const override
{ {
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol); GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) { if (!context) {
@ -260,7 +260,7 @@ public:
return new QGpgME::QGpgMEExportJob(context); return new QGpgME::QGpgMEExportJob(context);
} }
QGpgME::ExportJob *secretKeyExportJob(bool armor, const QString &) const Q_DECL_OVERRIDE QGpgME::ExportJob *secretKeyExportJob(bool armor, const QString &) const override
{ {
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol); GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) { if (!context) {
@ -271,7 +271,7 @@ public:
return new QGpgME::QGpgMEExportJob(context, GpgME::Context::ExportSecret); return new QGpgME::QGpgMEExportJob(context, GpgME::Context::ExportSecret);
} }
QGpgME::ExportJob *secretSubkeyExportJob(bool armor) const Q_DECL_OVERRIDE QGpgME::ExportJob *secretSubkeyExportJob(bool armor) const override
{ {
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol); GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) { if (!context) {
@ -282,7 +282,7 @@ public:
return new QGpgME::QGpgMEExportJob(context, GpgME::Context::ExportSecretSubkey); return new QGpgME::QGpgMEExportJob(context, GpgME::Context::ExportSecretSubkey);
} }
QGpgME::RefreshKeysJob *refreshKeysJob() const Q_DECL_OVERRIDE QGpgME::RefreshKeysJob *refreshKeysJob() const override
{ {
if (mProtocol != GpgME::CMS) { if (mProtocol != GpgME::CMS) {
return nullptr; return nullptr;
@ -291,7 +291,7 @@ public:
return new QGpgME::QGpgMERefreshSMIMEKeysJob; return new QGpgME::QGpgMERefreshSMIMEKeysJob;
} }
QGpgME::DownloadJob *downloadJob(bool armor) const Q_DECL_OVERRIDE QGpgME::DownloadJob *downloadJob(bool armor) const override
{ {
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol); GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) { if (!context) {
@ -304,7 +304,7 @@ public:
return new QGpgME::QGpgMEDownloadJob(context); return new QGpgME::QGpgMEDownloadJob(context);
} }
QGpgME::DeleteJob *deleteJob() const Q_DECL_OVERRIDE QGpgME::DeleteJob *deleteJob() const override
{ {
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol); GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) { if (!context) {
@ -313,7 +313,7 @@ public:
return new QGpgME::QGpgMEDeleteJob(context); return new QGpgME::QGpgMEDeleteJob(context);
} }
QGpgME::SignEncryptJob *signEncryptJob(bool armor, bool textMode) const Q_DECL_OVERRIDE QGpgME::SignEncryptJob *signEncryptJob(bool armor, bool textMode) const override
{ {
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol); GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) { if (!context) {
@ -325,7 +325,7 @@ public:
return new QGpgME::QGpgMESignEncryptJob(context); return new QGpgME::QGpgMESignEncryptJob(context);
} }
QGpgME::DecryptVerifyJob *decryptVerifyJob(bool textMode) const Q_DECL_OVERRIDE QGpgME::DecryptVerifyJob *decryptVerifyJob(bool textMode) const override
{ {
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol); GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) { if (!context) {
@ -336,7 +336,7 @@ public:
return new QGpgME::QGpgMEDecryptVerifyJob(context); return new QGpgME::QGpgMEDecryptVerifyJob(context);
} }
QGpgME::ChangeExpiryJob *changeExpiryJob() const Q_DECL_OVERRIDE QGpgME::ChangeExpiryJob *changeExpiryJob() const override
{ {
if (mProtocol != GpgME::OpenPGP) { if (mProtocol != GpgME::OpenPGP) {
return nullptr; // only supported by gpg return nullptr; // only supported by gpg
@ -349,7 +349,7 @@ public:
return new QGpgME::QGpgMEChangeExpiryJob(context); return new QGpgME::QGpgMEChangeExpiryJob(context);
} }
QGpgME::ChangePasswdJob *changePasswdJob() const Q_DECL_OVERRIDE QGpgME::ChangePasswdJob *changePasswdJob() const override
{ {
if (!GpgME::hasFeature(GpgME::PasswdFeature, 0)) { if (!GpgME::hasFeature(GpgME::PasswdFeature, 0)) {
return nullptr; return nullptr;
@ -361,7 +361,7 @@ public:
return new QGpgME::QGpgMEChangePasswdJob(context); return new QGpgME::QGpgMEChangePasswdJob(context);
} }
QGpgME::SignKeyJob *signKeyJob() const Q_DECL_OVERRIDE QGpgME::SignKeyJob *signKeyJob() const override
{ {
if (mProtocol != GpgME::OpenPGP) { if (mProtocol != GpgME::OpenPGP) {
return nullptr; // only supported by gpg return nullptr; // only supported by gpg
@ -374,7 +374,7 @@ public:
return new QGpgME::QGpgMESignKeyJob(context); return new QGpgME::QGpgMESignKeyJob(context);
} }
QGpgME::ChangeOwnerTrustJob *changeOwnerTrustJob() const Q_DECL_OVERRIDE QGpgME::ChangeOwnerTrustJob *changeOwnerTrustJob() const override
{ {
if (mProtocol != GpgME::OpenPGP) { if (mProtocol != GpgME::OpenPGP) {
return nullptr; // only supported by gpg return nullptr; // only supported by gpg
@ -400,7 +400,7 @@ public:
return new QGpgME::QGpgMEAddExistingSubkeyJob{context}; return new QGpgME::QGpgMEAddExistingSubkeyJob{context};
} }
QGpgME::AddUserIDJob *addUserIDJob() const Q_DECL_OVERRIDE QGpgME::AddUserIDJob *addUserIDJob() const override
{ {
if (mProtocol != GpgME::OpenPGP) { if (mProtocol != GpgME::OpenPGP) {
return nullptr; // only supported by gpg return nullptr; // only supported by gpg
@ -413,7 +413,7 @@ public:
return new QGpgME::QGpgMEAddUserIDJob(context); return new QGpgME::QGpgMEAddUserIDJob(context);
} }
QGpgME::KeyListJob *locateKeysJob() const Q_DECL_OVERRIDE QGpgME::KeyListJob *locateKeysJob() const override
{ {
if (mProtocol != GpgME::OpenPGP) { if (mProtocol != GpgME::OpenPGP) {
return nullptr; return nullptr;
@ -426,7 +426,7 @@ public:
return new QGpgME::QGpgMEKeyListJob(context); return new QGpgME::QGpgMEKeyListJob(context);
} }
QGpgME::KeyForMailboxJob *keyForMailboxJob() const Q_DECL_OVERRIDE QGpgME::KeyForMailboxJob *keyForMailboxJob() const override
{ {
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol); GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) { if (!context) {
@ -435,7 +435,7 @@ public:
return new QGpgME::QGpgMEKeyForMailboxJob(context); return new QGpgME::QGpgMEKeyForMailboxJob(context);
} }
QGpgME::WKDLookupJob *wkdLookupJob() const Q_DECL_OVERRIDE QGpgME::WKDLookupJob *wkdLookupJob() const override
{ {
if (mProtocol != GpgME::OpenPGP) { if (mProtocol != GpgME::OpenPGP) {
return nullptr; return nullptr;
@ -447,7 +447,7 @@ public:
return new QGpgME::QGpgMEWKDLookupJob(context.release()); return new QGpgME::QGpgMEWKDLookupJob(context.release());
} }
QGpgME::WKSPublishJob *wksPublishJob() const Q_DECL_OVERRIDE QGpgME::WKSPublishJob *wksPublishJob() const override
{ {
if (mProtocol != GpgME::OpenPGP) { if (mProtocol != GpgME::OpenPGP) {
return nullptr; return nullptr;
@ -459,7 +459,7 @@ public:
return new QGpgME::QGpgMEWKSPublishJob(context.release()); return new QGpgME::QGpgMEWKSPublishJob(context.release());
} }
QGpgME::TofuPolicyJob *tofuPolicyJob() const Q_DECL_OVERRIDE QGpgME::TofuPolicyJob *tofuPolicyJob() const override
{ {
if (mProtocol != GpgME::OpenPGP) { if (mProtocol != GpgME::OpenPGP) {
return nullptr; return nullptr;
@ -471,7 +471,7 @@ public:
return new QGpgME::QGpgMETofuPolicyJob(context); return new QGpgME::QGpgMETofuPolicyJob(context);
} }
QGpgME::QuickJob *quickJob() const Q_DECL_OVERRIDE QGpgME::QuickJob *quickJob() const override
{ {
if (mProtocol != GpgME::OpenPGP) { if (mProtocol != GpgME::OpenPGP) {
return nullptr; return nullptr;
@ -483,7 +483,7 @@ public:
return new QGpgME::QGpgMEQuickJob(context); return new QGpgME::QGpgMEQuickJob(context);
} }
QGpgME::RevokeKeyJob *revokeKeyJob() const Q_DECL_OVERRIDE QGpgME::RevokeKeyJob *revokeKeyJob() const override
{ {
if (mProtocol != GpgME::OpenPGP) { if (mProtocol != GpgME::OpenPGP) {
return nullptr; return nullptr;

2
lang/qt/src/qgpgmeadduseridjob.h
View File

@ -59,7 +59,7 @@ public:
~QGpgMEAddUserIDJob(); ~QGpgMEAddUserIDJob();
/* from AddUserIDJob */ /* from AddUserIDJob */
GpgME::Error start(const GpgME::Key &key, const QString &name, const QString &email, const QString &comment) Q_DECL_OVERRIDE; GpgME::Error start(const GpgME::Key &key, const QString &name, const QString &email, const QString &comment) override;
}; };
} }

4
lang/qt/src/qgpgmechangeexpiryjob.h
View File

@ -59,11 +59,11 @@ public:
~QGpgMEChangeExpiryJob(); ~QGpgMEChangeExpiryJob();
/* from ChangeExpiryJob */ /* from ChangeExpiryJob */
GpgME::Error start(const GpgME::Key &key, const QDateTime &expiry) Q_DECL_OVERRIDE; GpgME::Error start(const GpgME::Key &key, const QDateTime &expiry) override;
/* from ChangeExpiryJob */ /* from ChangeExpiryJob */
GpgME::Error start(const GpgME::Key &key, const QDateTime &expiry, GpgME::Error start(const GpgME::Key &key, const QDateTime &expiry,
const std::vector<GpgME::Subkey> &subkeys) Q_DECL_OVERRIDE; const std::vector<GpgME::Subkey> &subkeys) override;
}; };

2
lang/qt/src/qgpgmechangeownertrustjob.h
View File

@ -59,7 +59,7 @@ public:
~QGpgMEChangeOwnerTrustJob(); ~QGpgMEChangeOwnerTrustJob();
/* from ChangeOwnerTrustJob */ /* from ChangeOwnerTrustJob */
GpgME::Error start(const GpgME::Key &key, GpgME::Key::OwnerTrust trust) Q_DECL_OVERRIDE; GpgME::Error start(const GpgME::Key &key, GpgME::Key::OwnerTrust trust) override;
}; };
} }

2
lang/qt/src/qgpgmechangepasswdjob.h
View File

@ -59,7 +59,7 @@ public:
~QGpgMEChangePasswdJob(); ~QGpgMEChangePasswdJob();
/* from ChangePasswdJob */ /* from ChangePasswdJob */
GpgME::Error start(const GpgME::Key &key) Q_DECL_OVERRIDE; GpgME::Error start(const GpgME::Key &key) override;
}; };
} }

8
lang/qt/src/qgpgmedecryptjob.h
View File

@ -65,17 +65,17 @@ public:
~QGpgMEDecryptJob(); ~QGpgMEDecryptJob();
/* from DecryptJob */ /* from DecryptJob */
GpgME::Error start(const QByteArray &cipherText) Q_DECL_OVERRIDE; GpgME::Error start(const QByteArray &cipherText) override;
/* from DecryptJob */ /* from DecryptJob */
void start(const std::shared_ptr<QIODevice> &cipherText, const std::shared_ptr<QIODevice> &plainText) Q_DECL_OVERRIDE; void start(const std::shared_ptr<QIODevice> &cipherText, const std::shared_ptr<QIODevice> &plainText) override;
/* from DecryptJob */ /* from DecryptJob */
GpgME::DecryptionResult exec(const QByteArray &cipherText, GpgME::DecryptionResult exec(const QByteArray &cipherText,
QByteArray &plainText) Q_DECL_OVERRIDE; QByteArray &plainText) override;
/* from ThreadedJobMixin */ /* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE; void resultHook(const result_type &r) override;
private: private:
GpgME::DecryptionResult mResult; GpgME::DecryptionResult mResult;

8
lang/qt/src/qgpgmedecryptverifyjob.h
View File

@ -70,17 +70,17 @@ public:
~QGpgMEDecryptVerifyJob(); ~QGpgMEDecryptVerifyJob();
/* from DecryptVerifyJob */ /* from DecryptVerifyJob */
GpgME::Error start(const QByteArray &cipherText) Q_DECL_OVERRIDE; GpgME::Error start(const QByteArray &cipherText) override;
/* from DecryptVerifyJob */ /* from DecryptVerifyJob */
void start(const std::shared_ptr<QIODevice> &cipherText, const std::shared_ptr<QIODevice> &plainText) Q_DECL_OVERRIDE; void start(const std::shared_ptr<QIODevice> &cipherText, const std::shared_ptr<QIODevice> &plainText) override;
/* from DecryptVerifyJob */ /* from DecryptVerifyJob */
std::pair<GpgME::DecryptionResult, GpgME::VerificationResult> std::pair<GpgME::DecryptionResult, GpgME::VerificationResult>
exec(const QByteArray &cipherText, QByteArray &plainText) Q_DECL_OVERRIDE; exec(const QByteArray &cipherText, QByteArray &plainText) override;
/* from ThreadedJobMixin */ /* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE; void resultHook(const result_type &r) override;
private: private:
std::pair<GpgME::DecryptionResult, GpgME::VerificationResult> mResult; std::pair<GpgME::DecryptionResult, GpgME::VerificationResult> mResult;

2
lang/qt/src/qgpgmedeletejob.h
View File

@ -64,7 +64,7 @@ public:
~QGpgMEDeleteJob(); ~QGpgMEDeleteJob();
/* from DeleteJob */ /* from DeleteJob */
GpgME::Error start(const GpgME::Key &key, bool allowSecretKeyDeletion) Q_DECL_OVERRIDE; GpgME::Error start(const GpgME::Key &key, bool allowSecretKeyDeletion) override;
}; };
} }

4
lang/qt/src/qgpgmedownloadjob.h
View File

@ -59,10 +59,10 @@ public:
~QGpgMEDownloadJob(); ~QGpgMEDownloadJob();
/* from DownloadJob */ /* from DownloadJob */
GpgME::Error start(const QStringList &fingerprints) Q_DECL_OVERRIDE; GpgME::Error start(const QStringList &fingerprints) override;
/* from DownloadJob */ /* from DownloadJob */
GpgME::Error start(const QByteArray &fingerprint, const std::shared_ptr<QIODevice> &keyData) Q_DECL_OVERRIDE; GpgME::Error start(const QByteArray &fingerprint, const std::shared_ptr<QIODevice> &keyData) override;
}; };
} }

14
lang/qt/src/qgpgmeencryptjob.h
View File

@ -71,34 +71,34 @@ public:
/* from EncryptJob */ /* from EncryptJob */
GpgME::Error start(const std::vector<GpgME::Key> &recipients, GpgME::Error start(const std::vector<GpgME::Key> &recipients,
const QByteArray &plainText, bool alwaysTrust) Q_DECL_OVERRIDE; const QByteArray &plainText, bool alwaysTrust) override;
/* from EncryptJob */ /* from EncryptJob */
void start(const std::vector<GpgME::Key> &recipients, void start(const std::vector<GpgME::Key> &recipients,
const std::shared_ptr<QIODevice> &plainText, const std::shared_ptr<QIODevice> &plainText,
const std::shared_ptr<QIODevice> &cipherText, const std::shared_ptr<QIODevice> &cipherText,
bool alwaysTrust) Q_DECL_OVERRIDE; bool alwaysTrust) override;
/* from EncryptJob */ /* from EncryptJob */
GpgME::EncryptionResult exec(const std::vector<GpgME::Key> &recipients, GpgME::EncryptionResult exec(const std::vector<GpgME::Key> &recipients,
const QByteArray &plainText, bool alwaysTrust, const QByteArray &plainText, bool alwaysTrust,
QByteArray &cipherText) Q_DECL_OVERRIDE; QByteArray &cipherText) override;
/* from EncryptJob */ /* from EncryptJob */
void start(const std::vector<GpgME::Key> &recipients, void start(const std::vector<GpgME::Key> &recipients,
const std::shared_ptr<QIODevice> &plainText, const std::shared_ptr<QIODevice> &plainText,
const std::shared_ptr<QIODevice> &cipherText, const std::shared_ptr<QIODevice> &cipherText,
const GpgME::Context::EncryptionFlags flags) Q_DECL_OVERRIDE; const GpgME::Context::EncryptionFlags flags) override;
/* from EncryptJob */ /* from EncryptJob */
GpgME::EncryptionResult exec(const std::vector<GpgME::Key> &recipients, GpgME::EncryptionResult exec(const std::vector<GpgME::Key> &recipients,
const QByteArray &plainText, const GpgME::Context::EncryptionFlags flags, const QByteArray &plainText, const GpgME::Context::EncryptionFlags flags,
QByteArray &cipherText) Q_DECL_OVERRIDE; QByteArray &cipherText) override;
/* from EncryptJob */ /* from EncryptJob */
void setOutputIsBase64Encoded(bool on) Q_DECL_OVERRIDE; void setOutputIsBase64Encoded(bool on) override;
/* from ThreadedJobMixin */ /* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE; void resultHook(const result_type &r) override;
private: private:
bool mOutputIsBase64Encoded; bool mOutputIsBase64Encoded;

6
lang/qt/src/qgpgmeexportjob.h
View File

@ -62,13 +62,13 @@ public:
// export mode flags set with @p exportMode cannot be overridden with // export mode flags set with @p exportMode cannot be overridden with
// setExportFlags. // setExportFlags.
explicit QGpgMEExportJob(GpgME::Context *context, unsigned int exportMode); explicit QGpgMEExportJob(GpgME::Context *context, unsigned int exportMode);
~QGpgMEExportJob() Q_DECL_OVERRIDE; ~QGpgMEExportJob() override;
/* from ExportJob */ /* from ExportJob */
void setExportFlags(unsigned int flags) Q_DECL_OVERRIDE; void setExportFlags(unsigned int flags) override;
/* from ExportJob */ /* from ExportJob */
GpgME::Error start(const QStringList &patterns) Q_DECL_OVERRIDE; GpgME::Error start(const QStringList &patterns) override;
private: private:
unsigned int m_exportMode; unsigned int m_exportMode;

4
lang/qt/src/qgpgmegpgcardjob.h
View File

@ -54,9 +54,9 @@ public:
explicit QGpgMEGpgCardJob(); explicit QGpgMEGpgCardJob();
~QGpgMEGpgCardJob(); ~QGpgMEGpgCardJob();
GpgME::Error start(const QStringList &cmds) Q_DECL_OVERRIDE; GpgME::Error start(const QStringList &cmds) override;
GpgME::Error exec(const QStringList &cmds, QString &std_out, QString &std_err, int &exitCode) Q_DECL_OVERRIDE; GpgME::Error exec(const QStringList &cmds, QString &std_out, QString &std_err, int &exitCode) override;
}; };
} }

6
lang/qt/src/qgpgmeimportfromkeyserverjob.h
View File

@ -65,13 +65,13 @@ public:
~QGpgMEImportFromKeyserverJob(); ~QGpgMEImportFromKeyserverJob();
/* from ImportFromKeyserverJob */ /* from ImportFromKeyserverJob */
GpgME::Error start(const std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE; GpgME::Error start(const std::vector<GpgME::Key> &keys) override;
/* from ImportFromKeyserverJob */ /* from ImportFromKeyserverJob */
GpgME::ImportResult exec(const std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE; GpgME::ImportResult exec(const std::vector<GpgME::Key> &keys) override;
/* from ThreadedJobMixin */ /* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE; void resultHook(const result_type &r) override;
private: private:
GpgME::ImportResult mResult; GpgME::ImportResult mResult;

6
lang/qt/src/qgpgmeimportjob.h
View File

@ -67,15 +67,15 @@ public:
~QGpgMEImportJob(); ~QGpgMEImportJob();
/* from ImportJob */ /* from ImportJob */
GpgME::Error start(const QByteArray &keyData) Q_DECL_OVERRIDE; GpgME::Error start(const QByteArray &keyData) override;
/* from ImportJob */ /* from ImportJob */
GpgME::ImportResult exec(const QByteArray &keyData) Q_DECL_OVERRIDE; GpgME::ImportResult exec(const QByteArray &keyData) override;
GpgME::Error startLater(const QByteArray &keyData) override; GpgME::Error startLater(const QByteArray &keyData) override;
/* from ThreadedJobMixin */ /* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE; void resultHook(const result_type &r) override;
private: private:
GpgME::ImportResult mResult; GpgME::ImportResult mResult;

4
lang/qt/src/qgpgmekeyformailboxjob.h
View File

@ -76,9 +76,9 @@ public:
usage are returned. Use this if you need to select a usage are returned. Use this if you need to select a
key for signing. key for signing.
*/ */
GpgME::Error start(const QString &mailbox, bool canEncrypt = true) Q_DECL_OVERRIDE; GpgME::Error start(const QString &mailbox, bool canEncrypt = true) override;
GpgME::KeyListResult exec(const QString &mailbox, bool canEncrypt, GpgME::Key &key, GpgME::UserID &uid) Q_DECL_OVERRIDE; GpgME::KeyListResult exec(const QString &mailbox, bool canEncrypt, GpgME::Key &key, GpgME::UserID &uid) override;
}; };
} }

2
lang/qt/src/qgpgmekeygenerationjob.h
View File

@ -65,7 +65,7 @@ public:
~QGpgMEKeyGenerationJob(); ~QGpgMEKeyGenerationJob();
/* from KeygenerationJob */ /* from KeygenerationJob */
GpgME::Error start(const QString &parameters) Q_DECL_OVERRIDE; GpgME::Error start(const QString &parameters) override;
}; };
} }

8
lang/qt/src/qgpgmekeylistjob.h
View File

@ -70,15 +70,15 @@ public:
~QGpgMEKeyListJob(); ~QGpgMEKeyListJob();
/* from KeyListJob */ /* from KeyListJob */
GpgME::Error start(const QStringList &patterns, bool secretOnly) Q_DECL_OVERRIDE; GpgME::Error start(const QStringList &patterns, bool secretOnly) override;
/* from KeyListJob */ /* from KeyListJob */
GpgME::KeyListResult exec(const QStringList &patterns, bool secretOnly, std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE; GpgME::KeyListResult exec(const QStringList &patterns, bool secretOnly, std::vector<GpgME::Key> &keys) override;
void addMode(GpgME::KeyListMode mode) Q_DECL_OVERRIDE; void addMode(GpgME::KeyListMode mode) override;
/* from ThreadedJobMixin */ /* from ThreadedJobMixin */
void resultHook(const result_type &result) Q_DECL_OVERRIDE; void resultHook(const result_type &result) override;
private: private:
GpgME::KeyListResult mResult; GpgME::KeyListResult mResult;
bool mSecretOnly; bool mSecretOnly;

6
lang/qt/src/qgpgmelistallkeysjob.h
View File

@ -70,13 +70,13 @@ public:
~QGpgMEListAllKeysJob(); ~QGpgMEListAllKeysJob();
/* from ListAllKeysJob */ /* from ListAllKeysJob */
GpgME::Error start(bool mergeKeys) Q_DECL_OVERRIDE; GpgME::Error start(bool mergeKeys) override;
/* from ListAllKeysJob */ /* from ListAllKeysJob */
GpgME::KeyListResult exec(std::vector<GpgME::Key> &pub, std::vector<GpgME::Key> &sec, bool mergeKeys) Q_DECL_OVERRIDE; GpgME::KeyListResult exec(std::vector<GpgME::Key> &pub, std::vector<GpgME::Key> &sec, bool mergeKeys) override;
/* from ThreadedJobMixin */ /* from ThreadedJobMixin */
void resultHook(const result_type &result) Q_DECL_OVERRIDE; void resultHook(const result_type &result) override;
private: private:
GpgME::KeyListResult mResult; GpgME::KeyListResult mResult;

92
lang/qt/src/qgpgmenewcryptoconfig.h
View File

@ -63,36 +63,36 @@ public:
QGpgMENewCryptoConfigEntry(const std::shared_ptr<QGpgMENewCryptoConfigGroup> &group, const GpgME::Configuration::Option &option); QGpgMENewCryptoConfigEntry(const std::shared_ptr<QGpgMENewCryptoConfigGroup> &group, const GpgME::Configuration::Option &option);
~QGpgMENewCryptoConfigEntry(); ~QGpgMENewCryptoConfigEntry();
QString name() const Q_DECL_OVERRIDE; QString name() const override;
QString description() const Q_DECL_OVERRIDE; QString description() const override;
QString path() const Q_DECL_OVERRIDE; QString path() const override;
bool isOptional() const Q_DECL_OVERRIDE; bool isOptional() const override;
bool isReadOnly() const Q_DECL_OVERRIDE; bool isReadOnly() const override;
bool isList() const Q_DECL_OVERRIDE; bool isList() const override;
bool isRuntime() const Q_DECL_OVERRIDE; bool isRuntime() const override;
Level level() const Q_DECL_OVERRIDE; Level level() const override;
ArgType argType() const Q_DECL_OVERRIDE; ArgType argType() const override;
bool isSet() const Q_DECL_OVERRIDE; bool isSet() const override;
bool boolValue() const Q_DECL_OVERRIDE; bool boolValue() const override;
QString stringValue() const Q_DECL_OVERRIDE; QString stringValue() const override;
int intValue() const Q_DECL_OVERRIDE; int intValue() const override;
unsigned int uintValue() const Q_DECL_OVERRIDE; unsigned int uintValue() const override;
QUrl urlValue() const Q_DECL_OVERRIDE; QUrl urlValue() const override;
unsigned int numberOfTimesSet() const Q_DECL_OVERRIDE; unsigned int numberOfTimesSet() const override;
std::vector<int> intValueList() const Q_DECL_OVERRIDE; std::vector<int> intValueList() const override;
std::vector<unsigned int> uintValueList() const Q_DECL_OVERRIDE; std::vector<unsigned int> uintValueList() const override;
QList<QUrl> urlValueList() const Q_DECL_OVERRIDE; QList<QUrl> urlValueList() const override;
void resetToDefault() Q_DECL_OVERRIDE; void resetToDefault() override;
void setBoolValue(bool) Q_DECL_OVERRIDE; void setBoolValue(bool) override;
void setStringValue(const QString &) Q_DECL_OVERRIDE; void setStringValue(const QString &) override;
void setIntValue(int) Q_DECL_OVERRIDE; void setIntValue(int) override;
void setUIntValue(unsigned int) Q_DECL_OVERRIDE; void setUIntValue(unsigned int) override;
void setURLValue(const QUrl &) Q_DECL_OVERRIDE; void setURLValue(const QUrl &) override;
void setNumberOfTimesSet(unsigned int) Q_DECL_OVERRIDE; void setNumberOfTimesSet(unsigned int) override;
void setIntValueList(const std::vector<int> &) Q_DECL_OVERRIDE; void setIntValueList(const std::vector<int> &) override;
void setUIntValueList(const std::vector<unsigned int> &) Q_DECL_OVERRIDE; void setUIntValueList(const std::vector<unsigned int> &) override;
void setURLValueList(const QList<QUrl> &) Q_DECL_OVERRIDE; void setURLValueList(const QList<QUrl> &) override;
bool isDirty() const Q_DECL_OVERRIDE; bool isDirty() const override;
QStringList stringValueList() const; QStringList stringValueList() const;
QVariant defaultValue() const; QVariant defaultValue() const;
@ -117,16 +117,16 @@ public:
QGpgMENewCryptoConfigGroup(const std::shared_ptr<QGpgMENewCryptoConfigComponent> &parent, const GpgME::Configuration::Option &option); QGpgMENewCryptoConfigGroup(const std::shared_ptr<QGpgMENewCryptoConfigComponent> &parent, const GpgME::Configuration::Option &option);
~QGpgMENewCryptoConfigGroup(); ~QGpgMENewCryptoConfigGroup();
QString name() const Q_DECL_OVERRIDE; QString name() const override;
QString iconName() const Q_DECL_OVERRIDE QString iconName() const override
{ {
return QString(); return QString();
} }
QString description() const Q_DECL_OVERRIDE; QString description() const override;
QString path() const Q_DECL_OVERRIDE; QString path() const override;
QGpgME::CryptoConfigEntry::Level level() const Q_DECL_OVERRIDE; QGpgME::CryptoConfigEntry::Level level() const override;
QStringList entryList() const Q_DECL_OVERRIDE; QStringList entryList() const override;
QGpgMENewCryptoConfigEntry *entry(const QString &name) const Q_DECL_OVERRIDE; QGpgMENewCryptoConfigEntry *entry(const QString &name) const override;
private: private:
friend class QGpgMENewCryptoConfigComponent; // it adds the entries friend class QGpgMENewCryptoConfigComponent; // it adds the entries
@ -145,14 +145,14 @@ public:
void setComponent(const GpgME::Configuration::Component &component); void setComponent(const GpgME::Configuration::Component &component);
QString name() const Q_DECL_OVERRIDE; QString name() const override;
QString iconName() const Q_DECL_OVERRIDE QString iconName() const override
{ {
return name(); return name();
} }
QString description() const Q_DECL_OVERRIDE; QString description() const override;
QStringList groupList() const Q_DECL_OVERRIDE; QStringList groupList() const override;
QGpgMENewCryptoConfigGroup *group(const QString &name) const Q_DECL_OVERRIDE; QGpgMENewCryptoConfigGroup *group(const QString &name) const override;
void sync(bool runtime); void sync(bool runtime);
@ -174,12 +174,12 @@ public:
QGpgMENewCryptoConfig(); QGpgMENewCryptoConfig();
~QGpgMENewCryptoConfig(); ~QGpgMENewCryptoConfig();
QStringList componentList() const Q_DECL_OVERRIDE; QStringList componentList() const override;
QGpgMENewCryptoConfigComponent *component(const QString &name) const Q_DECL_OVERRIDE; QGpgMENewCryptoConfigComponent *component(const QString &name) const override;
void clear() Q_DECL_OVERRIDE; void clear() override;
void sync(bool runtime) Q_DECL_OVERRIDE; void sync(bool runtime) override;
private: private:
/// @param showErrors if true, a messagebox will be shown if e.g. gpgconf wasn't found /// @param showErrors if true, a messagebox will be shown if e.g. gpgconf wasn't found

10
lang/qt/src/qgpgmequickjob.h
View File

@ -63,14 +63,14 @@ public:
const char *algo, const char *algo,
const QDateTime &expires = QDateTime(), const QDateTime &expires = QDateTime(),
const GpgME::Key &key = GpgME::Key(), const GpgME::Key &key = GpgME::Key(),
unsigned int flags = 0) Q_DECL_OVERRIDE; unsigned int flags = 0) override;
void startAddUid(const GpgME::Key &key, const QString &uid) Q_DECL_OVERRIDE; void startAddUid(const GpgME::Key &key, const QString &uid) override;
void startRevUid(const GpgME::Key &key, const QString &uid) Q_DECL_OVERRIDE; void startRevUid(const GpgME::Key &key, const QString &uid) override;
void startAddSubkey(const GpgME::Key &key, const char *algo, void startAddSubkey(const GpgME::Key &key, const char *algo,
const QDateTime &expires = QDateTime(), const QDateTime &expires = QDateTime(),
unsigned int flags = 0) Q_DECL_OVERRIDE; unsigned int flags = 0) override;
void startRevokeSignature(const GpgME::Key &key, const GpgME::Key &signingKey, void startRevokeSignature(const GpgME::Key &key, const GpgME::Key &signingKey,
const std::vector<GpgME::UserID> &userIds = std::vector<GpgME::UserID>()) Q_DECL_OVERRIDE; const std::vector<GpgME::UserID> &userIds = std::vector<GpgME::UserID>()) override;
}; };
} }

4
lang/qt/src/qgpgmerefreshsmimekeysjob.h
View File

@ -56,13 +56,13 @@ public:
~QGpgMERefreshSMIMEKeysJob(); ~QGpgMERefreshSMIMEKeysJob();
/* from RefreshKeysJob */ /* from RefreshKeysJob */
GpgME::Error start(const QStringList &patterns) Q_DECL_OVERRIDE; GpgME::Error start(const QStringList &patterns) override;
GpgME::Error start(const std::vector<GpgME::Key> &keys) override; GpgME::Error start(const std::vector<GpgME::Key> &keys) override;
private Q_SLOTS: private Q_SLOTS:
/* from Job */ /* from Job */
void slotCancel() Q_DECL_OVERRIDE; void slotCancel() override;
void slotStatus(QProcess *, const QString &, const QStringList &); void slotStatus(QProcess *, const QString &, const QStringList &);
void slotProcessExited(int exitCode, QProcess::ExitStatus exitStatus); void slotProcessExited(int exitCode, QProcess::ExitStatus exitStatus);

14
lang/qt/src/qgpgmesignencryptjob.h
View File

@ -79,38 +79,38 @@ public:
/* from SignEncryptJob */ /* from SignEncryptJob */
GpgME::Error start(const std::vector<GpgME::Key> &signers, GpgME::Error start(const std::vector<GpgME::Key> &signers,
const std::vector<GpgME::Key> &recipients, const std::vector<GpgME::Key> &recipients,
const QByteArray &plainText, bool alwaysTrust) Q_DECL_OVERRIDE; const QByteArray &plainText, bool alwaysTrust) override;
/* from SignEncryptJob */ /* from SignEncryptJob */
void start(const std::vector<GpgME::Key> &signers, void start(const std::vector<GpgME::Key> &signers,
const std::vector<GpgME::Key> &recipients, const std::vector<GpgME::Key> &recipients,
const std::shared_ptr<QIODevice> &plainText, const std::shared_ptr<QIODevice> &plainText,
const std::shared_ptr<QIODevice> &cipherText, const std::shared_ptr<QIODevice> &cipherText,
bool alwaysTrust) Q_DECL_OVERRIDE; bool alwaysTrust) override;
void start(const std::vector<GpgME::Key> &signers, void start(const std::vector<GpgME::Key> &signers,
const std::vector<GpgME::Key> &recipients, const std::vector<GpgME::Key> &recipients,
const std::shared_ptr<QIODevice> &plainText, const std::shared_ptr<QIODevice> &plainText,
const std::shared_ptr<QIODevice> &cipherText, const std::shared_ptr<QIODevice> &cipherText,
const GpgME::Context::EncryptionFlags flags) Q_DECL_OVERRIDE; const GpgME::Context::EncryptionFlags flags) override;
std::pair<GpgME::SigningResult, GpgME::EncryptionResult> std::pair<GpgME::SigningResult, GpgME::EncryptionResult>
exec(const std::vector<GpgME::Key> &signers, exec(const std::vector<GpgME::Key> &signers,
const std::vector<GpgME::Key> &recipients, const std::vector<GpgME::Key> &recipients,
const QByteArray &plainText, bool alwaysTrust, const QByteArray &plainText, bool alwaysTrust,
QByteArray &cipherText) Q_DECL_OVERRIDE; QByteArray &cipherText) override;
std::pair<GpgME::SigningResult, GpgME::EncryptionResult> std::pair<GpgME::SigningResult, GpgME::EncryptionResult>
exec(const std::vector<GpgME::Key> &signers, exec(const std::vector<GpgME::Key> &signers,
const std::vector<GpgME::Key> &recipients, const std::vector<GpgME::Key> &recipients,
const QByteArray &plainText, const GpgME::Context::EncryptionFlags flags, const QByteArray &plainText, const GpgME::Context::EncryptionFlags flags,
QByteArray &cipherText) Q_DECL_OVERRIDE; QByteArray &cipherText) override;
/* from SignEncryptJob */ /* from SignEncryptJob */
void setOutputIsBase64Encoded(bool on) Q_DECL_OVERRIDE; void setOutputIsBase64Encoded(bool on) override;
/* from ThreadedJobMixin */ /* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE; void resultHook(const result_type &r) override;
private: private:
bool mOutputIsBase64Encoded; bool mOutputIsBase64Encoded;

10
lang/qt/src/qgpgmesignjob.h
View File

@ -72,25 +72,25 @@ public:
/* from SignJob */ /* from SignJob */
GpgME::Error start(const std::vector<GpgME::Key> &signers, GpgME::Error start(const std::vector<GpgME::Key> &signers,
const QByteArray &plainText, const QByteArray &plainText,
GpgME::SignatureMode mode) Q_DECL_OVERRIDE; GpgME::SignatureMode mode) override;
/* from SignJob */ /* from SignJob */
void start(const std::vector<GpgME::Key> &signers, void start(const std::vector<GpgME::Key> &signers,
const std::shared_ptr<QIODevice> &plainText, const std::shared_ptr<QIODevice> &plainText,
const std::shared_ptr<QIODevice> &signature, const std::shared_ptr<QIODevice> &signature,
GpgME::SignatureMode mode) Q_DECL_OVERRIDE; GpgME::SignatureMode mode) override;
/* from SignJob */ /* from SignJob */
GpgME::SigningResult exec(const std::vector<GpgME::Key> &signers, GpgME::SigningResult exec(const std::vector<GpgME::Key> &signers,
const QByteArray &plainText, const QByteArray &plainText,
GpgME::SignatureMode mode, GpgME::SignatureMode mode,
QByteArray &signature) Q_DECL_OVERRIDE; QByteArray &signature) override;
/* from SignJob */ /* from SignJob */
void setOutputIsBase64Encoded(bool on) Q_DECL_OVERRIDE; void setOutputIsBase64Encoded(bool on) override;
/* from ThreadedJobMixin */ /* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE; void resultHook(const result_type &r) override;
private: private:
GpgME::SigningResult mResult; GpgME::SigningResult mResult;

18
lang/qt/src/qgpgmesignkeyjob.h
View File

@ -61,31 +61,31 @@ public:
~QGpgMESignKeyJob(); ~QGpgMESignKeyJob();
/* from SignKeyJob */ /* from SignKeyJob */
GpgME::Error start(const GpgME::Key &key) Q_DECL_OVERRIDE; GpgME::Error start(const GpgME::Key &key) override;
/* from SignKeyJob */ /* from SignKeyJob */
void setUserIDsToSign(const std::vector<unsigned int> &idsToSign) Q_DECL_OVERRIDE; void setUserIDsToSign(const std::vector<unsigned int> &idsToSign) override;
/* from SignKeyJob */ /* from SignKeyJob */
void setCheckLevel(unsigned int checkLevel) Q_DECL_OVERRIDE; void setCheckLevel(unsigned int checkLevel) override;
/* from SignKeyJob */ /* from SignKeyJob */
void setExportable(bool exportable) Q_DECL_OVERRIDE; void setExportable(bool exportable) override;
/* from SignKeyJob */ /* from SignKeyJob */
void setSigningKey(const GpgME::Key &key) Q_DECL_OVERRIDE; void setSigningKey(const GpgME::Key &key) override;
/* from SignKeyJob */ /* from SignKeyJob */
void setNonRevocable(bool nonRevocable) Q_DECL_OVERRIDE; void setNonRevocable(bool nonRevocable) override;
/* from SignKeyJob */ /* from SignKeyJob */
void setRemark(const QString &remark) Q_DECL_OVERRIDE; void setRemark(const QString &remark) override;
/* from SignKeyJob */ /* from SignKeyJob */
void setDupeOk(bool value) Q_DECL_OVERRIDE; void setDupeOk(bool value) override;
/* from SignKeyJob */ /* from SignKeyJob */
void setTrustSignature(GpgME::TrustSignatureTrust trust, unsigned short depth, const QString &scope) Q_DECL_OVERRIDE; void setTrustSignature(GpgME::TrustSignatureTrust trust, unsigned short depth, const QString &scope) override;
void setExpirationDate(const QDate &expiration) override; void setExpirationDate(const QDate &expiration) override;

4
lang/qt/src/qgpgmetofupolicyjob.h
View File

@ -57,8 +57,8 @@ public:
explicit QGpgMETofuPolicyJob(GpgME::Context *context); explicit QGpgMETofuPolicyJob(GpgME::Context *context);
~QGpgMETofuPolicyJob(); ~QGpgMETofuPolicyJob();
void start(const GpgME::Key &key, GpgME::TofuInfo::Policy policy) Q_DECL_OVERRIDE; void start(const GpgME::Key &key, GpgME::TofuInfo::Policy policy) override;
GpgME::Error exec(const GpgME::Key &key, GpgME::TofuInfo::Policy policy) Q_DECL_OVERRIDE; GpgME::Error exec(const GpgME::Key &key, GpgME::TofuInfo::Policy policy) override;
}; };
} }

8
lang/qt/src/qgpgmeverifydetachedjob.h
View File

@ -65,17 +65,17 @@ public:
~QGpgMEVerifyDetachedJob(); ~QGpgMEVerifyDetachedJob();
/* from VerifyDetachedJob */ /* from VerifyDetachedJob */
GpgME::Error start(const QByteArray &signature, const QByteArray &signedData) Q_DECL_OVERRIDE; GpgME::Error start(const QByteArray &signature, const QByteArray &signedData) override;
/* from VerifyDetachedJob */ /* from VerifyDetachedJob */
void start(const std::shared_ptr<QIODevice> &signature, const std::shared_ptr<QIODevice> &signedData) Q_DECL_OVERRIDE; void start(const std::shared_ptr<QIODevice> &signature, const std::shared_ptr<QIODevice> &signedData) override;
/* from VerifyDetachedJob */ /* from VerifyDetachedJob */
GpgME::VerificationResult exec(const QByteArray &signature, GpgME::VerificationResult exec(const QByteArray &signature,
const QByteArray &signedData) Q_DECL_OVERRIDE; const QByteArray &signedData) override;
/* from ThreadedJobMixin */ /* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE; void resultHook(const result_type &r) override;
private: private:
GpgME::VerificationResult mResult; GpgME::VerificationResult mResult;

8
lang/qt/src/qgpgmeverifyopaquejob.h
View File

@ -65,16 +65,16 @@ public:
~QGpgMEVerifyOpaqueJob(); ~QGpgMEVerifyOpaqueJob();
/* from VerifyOpaqueJob */ /* from VerifyOpaqueJob */
GpgME::Error start(const QByteArray &signedData) Q_DECL_OVERRIDE; GpgME::Error start(const QByteArray &signedData) override;
/* from VerifyOpaqueJob */ /* from VerifyOpaqueJob */
void start(const std::shared_ptr<QIODevice> &signedData, const std::shared_ptr<QIODevice> &plainText) Q_DECL_OVERRIDE; void start(const std::shared_ptr<QIODevice> &signedData, const std::shared_ptr<QIODevice> &plainText) override;
/* form VerifyOpaqueJob */ /* form VerifyOpaqueJob */
GpgME::VerificationResult exec(const QByteArray &signedData, QByteArray &plainData) Q_DECL_OVERRIDE; GpgME::VerificationResult exec(const QByteArray &signedData, QByteArray &plainData) override;
/* from ThreadedJobMixin */ /* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE; void resultHook(const result_type &r) override;
private: private:
GpgME::VerificationResult mResult; GpgME::VerificationResult mResult;

4
lang/qt/src/qgpgmewkdlookupjob.h
View File

@ -59,10 +59,10 @@ public:
~QGpgMEWKDLookupJob(); ~QGpgMEWKDLookupJob();
/* from WKDLookupJob */ /* from WKDLookupJob */
GpgME::Error start(const QString &email) Q_DECL_OVERRIDE; GpgME::Error start(const QString &email) override;
/* from WKDLookupJob */ /* from WKDLookupJob */
WKDLookupResult exec(const QString &email) Q_DECL_OVERRIDE; WKDLookupResult exec(const QString &email) override;
}; };
} }

6
lang/qt/src/qgpgmewkspublishjob.h
View File

@ -61,9 +61,9 @@ public:
explicit QGpgMEWKSPublishJob(GpgME::Context *context); explicit QGpgMEWKSPublishJob(GpgME::Context *context);
~QGpgMEWKSPublishJob(); ~QGpgMEWKSPublishJob();
void startCheck(const QString &mailbox) Q_DECL_OVERRIDE; void startCheck(const QString &mailbox) override;
void startCreate(const char *fpr, const QString &mailbox) Q_DECL_OVERRIDE; void startCreate(const char *fpr, const QString &mailbox) override;
void startReceive(const QByteArray &response) Q_DECL_OVERRIDE; void startReceive(const QByteArray &response) override;
}; };
} }

10
lang/qt/src/threadedjobmixin.h
View File

@ -116,7 +116,7 @@ public:
} }
private: private:
void run() Q_DECL_OVERRIDE { void run() override {
const QMutexLocker locker(&m_mutex); const QMutexLocker locker(&m_mutex);
m_result = m_function(); m_result = m_function();
} }
@ -236,22 +236,22 @@ protected:
doEmitResult(r); doEmitResult(r);
this->deleteLater(); this->deleteLater();
} }
void slotCancel() Q_DECL_OVERRIDE { void slotCancel() override {
if (m_ctx) if (m_ctx)
{ {
m_ctx->cancelPendingOperation(); m_ctx->cancelPendingOperation();
} }
} }
QString auditLogAsHtml() const Q_DECL_OVERRIDE QString auditLogAsHtml() const override
{ {
return m_auditLog; return m_auditLog;
} }
GpgME::Error auditLogError() const Q_DECL_OVERRIDE GpgME::Error auditLogError() const override
{ {
return m_auditLogError; return m_auditLogError;
} }
void showProgress(const char * /*what*/, void showProgress(const char * /*what*/,
int /*type*/, int current, int total) Q_DECL_OVERRIDE { int /*type*/, int current, int total) override {
// will be called from the thread exec'ing the operation, so // will be called from the thread exec'ing the operation, so
// just bounce everything to the owning thread: // just bounce everything to the owning thread:
// ### hope this is thread-safe (meta obj is const, and // ### hope this is thread-safe (meta obj is const, and

2
lang/qt/tests/t-support.h
View File

@ -89,7 +89,7 @@ class TestPassphraseProvider : public PassphraseProvider
{ {
public: public:
char *getPassphrase(const char * /*useridHint*/, const char * /*description*/, char *getPassphrase(const char * /*useridHint*/, const char * /*description*/,
bool /*previousWasBad*/, bool &/*canceled*/) Q_DECL_OVERRIDE bool /*previousWasBad*/, bool &/*canceled*/) override
{ {
char *ret; char *ret;
gpgrt_asprintf(&ret, "abc"); gpgrt_asprintf(&ret, "abc");