[git] GPGME - branch, gpgmepp, updated. gpgme-1.6.0-59-gb7d5c2c
by Andre Heinecke
cvs at cvs.gnupg.org
Tue May 10 14:34:33 CEST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".
The branch, gpgmepp has been updated
via b7d5c2cced796d4092a9f424368fc999165f9d13 (commit)
via 56c4d9ea9520c95612e525b2fa1359db6fa88f4a (commit)
via 97225bb01cd2ffa1d84c7fedbc577275de4a4893 (commit)
via 740f92a7b83389ee9bde98b7bd25556793500b8b (commit)
via 0e3195948ddaba3af07d2415bb496491076edc17 (commit)
from a579be82c84f0b9732ee3d52ff2142a3decf95d7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b7d5c2cced796d4092a9f424368fc999165f9d13
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue May 10 14:32:22 2016 +0200
Qt: Fix unkonwn doxygen keyword warnings
--
Reimp is not a keqword and we inherit documentation anyway.
diff --git a/lang/qt/src/dataprovider.h b/lang/qt/src/dataprovider.h
index 672980a..337f264 100644
--- a/lang/qt/src/dataprovider.h
+++ b/lang/qt/src/dataprovider.h
@@ -50,18 +50,13 @@ public:
private:
// these shall only be accessed through the dataprovider
// interface, where they're public:
- /*! \reimp */
bool isSupported(Operation) const
{
return true;
}
- /*! \reimp */
ssize_t read(void *buffer, size_t bufSize);
- /*! \reimp */
ssize_t write(const void *buffer, size_t bufSize);
- /*! \reimp */
off_t seek(off_t offset, int whence);
- /*! \reimp */
void release();
private:
@@ -83,15 +78,10 @@ public:
private:
// these shall only be accessed through the dataprovider
// interface, where they're public:
- /*! \reimp */
bool isSupported(Operation) const;
- /*! \reimp */
ssize_t read(void *buffer, size_t bufSize);
- /*! \reimp */
ssize_t write(const void *buffer, size_t bufSize);
- /*! \reimp */
off_t seek(off_t offset, int whence);
- /*! \reimp */
void release();
private:
diff --git a/lang/qt/src/hierarchicalkeylistjob.h b/lang/qt/src/hierarchicalkeylistjob.h
index 7cc519a..2ec187d 100644
--- a/lang/qt/src/hierarchicalkeylistjob.h
+++ b/lang/qt/src/hierarchicalkeylistjob.h
@@ -101,7 +101,7 @@ public:
private Q_SLOTS:
void slotResult(const GpgME::KeyListResult &);
void slotNextKey(const GpgME::Key &key);
- /*! \reimp from Job */
+ /* from Job */
void slotCancel() Q_DECL_OVERRIDE;
private:
diff --git a/lang/qt/src/multideletejob.h b/lang/qt/src/multideletejob.h
index fca73d0..8915cd1 100644
--- a/lang/qt/src/multideletejob.h
+++ b/lang/qt/src/multideletejob.h
@@ -82,7 +82,7 @@ public:
*/
GpgME::Error start(const std::vector<GpgME::Key> &keys, bool allowSecretKeyDeletion = false);
- /*! \reimp from Job */
+ /* from Job */
void slotCancel() Q_DECL_OVERRIDE;
Q_SIGNALS:
diff --git a/lang/qt/src/qgpgmeadduseridjob.h b/lang/qt/src/qgpgmeadduseridjob.h
index f77b3c8..294eb6c 100644
--- a/lang/qt/src/qgpgmeadduseridjob.h
+++ b/lang/qt/src/qgpgmeadduseridjob.h
@@ -57,7 +57,7 @@ public:
explicit QGpgMEAddUserIDJob(GpgME::Context *context);
~QGpgMEAddUserIDJob();
- /*! \reimp from AddUserIDJob */
+ /* from AddUserIDJob */
GpgME::Error start(const GpgME::Key &key, const QString &name, const QString &email, const QString &comment) Q_DECL_OVERRIDE;
};
}
diff --git a/lang/qt/src/qgpgmechangeexpiryjob.h b/lang/qt/src/qgpgmechangeexpiryjob.h
index fab1259..4abdf78 100644
--- a/lang/qt/src/qgpgmechangeexpiryjob.h
+++ b/lang/qt/src/qgpgmechangeexpiryjob.h
@@ -57,7 +57,7 @@ public:
explicit QGpgMEChangeExpiryJob(GpgME::Context *context);
~QGpgMEChangeExpiryJob();
- /*! \reimp from ChangeExpiryJob */
+ /* from ChangeExpiryJob */
GpgME::Error start(const GpgME::Key &key, const QDateTime &expiry) Q_DECL_OVERRIDE;
};
diff --git a/lang/qt/src/qgpgmechangeownertrustjob.h b/lang/qt/src/qgpgmechangeownertrustjob.h
index 7ff03a3..7740616 100644
--- a/lang/qt/src/qgpgmechangeownertrustjob.h
+++ b/lang/qt/src/qgpgmechangeownertrustjob.h
@@ -57,7 +57,7 @@ public:
explicit QGpgMEChangeOwnerTrustJob(GpgME::Context *context);
~QGpgMEChangeOwnerTrustJob();
- /*! \reimp from ChangeOwnerTrustJob */
+ /* from ChangeOwnerTrustJob */
GpgME::Error start(const GpgME::Key &key, GpgME::Key::OwnerTrust trust) Q_DECL_OVERRIDE;
};
}
diff --git a/lang/qt/src/qgpgmechangepasswdjob.h b/lang/qt/src/qgpgmechangepasswdjob.h
index 1531e76..e37789e 100644
--- a/lang/qt/src/qgpgmechangepasswdjob.h
+++ b/lang/qt/src/qgpgmechangepasswdjob.h
@@ -57,7 +57,7 @@ public:
explicit QGpgMEChangePasswdJob(GpgME::Context *context);
~QGpgMEChangePasswdJob();
- /*! \reimp from ChangePasswdJob */
+ /* from ChangePasswdJob */
GpgME::Error start(const GpgME::Key &key) Q_DECL_OVERRIDE;
};
diff --git a/lang/qt/src/qgpgmedecryptjob.h b/lang/qt/src/qgpgmedecryptjob.h
index e7ed04f..5335e84 100644
--- a/lang/qt/src/qgpgmedecryptjob.h
+++ b/lang/qt/src/qgpgmedecryptjob.h
@@ -63,17 +63,17 @@ public:
explicit QGpgMEDecryptJob(GpgME::Context *context);
~QGpgMEDecryptJob();
- /*! \reimp from DecryptJob */
+ /* from DecryptJob */
GpgME::Error start(const QByteArray &cipherText) Q_DECL_OVERRIDE;
- /*! \reimp from DecryptJob */
+ /* from DecryptJob */
void start(const std::shared_ptr<QIODevice> &cipherText, const std::shared_ptr<QIODevice> &plainText) Q_DECL_OVERRIDE;
- /*! \reimp from DecryptJob */
+ /* from DecryptJob */
GpgME::DecryptionResult exec(const QByteArray &cipherText,
QByteArray &plainText) Q_DECL_OVERRIDE;
- /*! \reimp from ThreadedJobMixin */
+ /* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:
diff --git a/lang/qt/src/qgpgmedecryptverifyjob.h b/lang/qt/src/qgpgmedecryptverifyjob.h
index 4a209b9..de2bce7 100644
--- a/lang/qt/src/qgpgmedecryptverifyjob.h
+++ b/lang/qt/src/qgpgmedecryptverifyjob.h
@@ -68,17 +68,17 @@ public:
explicit QGpgMEDecryptVerifyJob(GpgME::Context *context);
~QGpgMEDecryptVerifyJob();
- /*! \reimp from DecryptVerifyJob */
+ /* from DecryptVerifyJob */
GpgME::Error start(const QByteArray &cipherText) Q_DECL_OVERRIDE;
- /*! \reimp from DecryptVerifyJob */
+ /* from DecryptVerifyJob */
void start(const std::shared_ptr<QIODevice> &cipherText, const std::shared_ptr<QIODevice> &plainText) Q_DECL_OVERRIDE;
- /*! \reimp from DecryptVerifyJob */
+ /* from DecryptVerifyJob */
std::pair<GpgME::DecryptionResult, GpgME::VerificationResult>
exec(const QByteArray &cipherText, QByteArray &plainText) Q_DECL_OVERRIDE;
- /*! \reimp from ThreadedJobMixin */
+ /* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:
diff --git a/lang/qt/src/qgpgmedeletejob.h b/lang/qt/src/qgpgmedeletejob.h
index a2b0d10..992442f 100644
--- a/lang/qt/src/qgpgmedeletejob.h
+++ b/lang/qt/src/qgpgmedeletejob.h
@@ -62,7 +62,7 @@ public:
explicit QGpgMEDeleteJob(GpgME::Context *context);
~QGpgMEDeleteJob();
- /*! \reimp from DeleteJob */
+ /* from DeleteJob */
GpgME::Error start(const GpgME::Key &key, bool allowSecretKeyDeletion) Q_DECL_OVERRIDE;
};
diff --git a/lang/qt/src/qgpgmedownloadjob.h b/lang/qt/src/qgpgmedownloadjob.h
index b1120d1..4091190 100644
--- a/lang/qt/src/qgpgmedownloadjob.h
+++ b/lang/qt/src/qgpgmedownloadjob.h
@@ -57,10 +57,10 @@ public:
explicit QGpgMEDownloadJob(GpgME::Context *context);
~QGpgMEDownloadJob();
- /*! \reimp from DownloadJob */
+ /* from DownloadJob */
GpgME::Error start(const QStringList &fingerprints) Q_DECL_OVERRIDE;
- /*! \reimp from DownloadJob */
+ /* from DownloadJob */
GpgME::Error start(const QByteArray &fingerprint, const std::shared_ptr<QIODevice> &keyData) Q_DECL_OVERRIDE;
};
diff --git a/lang/qt/src/qgpgmeencryptjob.h b/lang/qt/src/qgpgmeencryptjob.h
index fc6ad5f..d35a41b 100644
--- a/lang/qt/src/qgpgmeencryptjob.h
+++ b/lang/qt/src/qgpgmeencryptjob.h
@@ -68,25 +68,25 @@ public:
explicit QGpgMEEncryptJob(GpgME::Context *context);
~QGpgMEEncryptJob();
- /*! \reimp from EncryptJob */
+ /* from EncryptJob */
GpgME::Error start(const std::vector<GpgME::Key> &recipients,
const QByteArray &plainText, bool alwaysTrust) Q_DECL_OVERRIDE;
- /*! \reimp from EncryptJob */
+ /* from EncryptJob */
void start(const std::vector<GpgME::Key> &recipients,
const std::shared_ptr<QIODevice> &plainText,
const std::shared_ptr<QIODevice> &cipherText,
bool alwaysTrust) Q_DECL_OVERRIDE;
- /*! \reimp from EncryptJob */
+ /* from EncryptJob */
GpgME::EncryptionResult exec(const std::vector<GpgME::Key> &recipients,
const QByteArray &plainText, bool alwaysTrust,
QByteArray &cipherText) Q_DECL_OVERRIDE;
- /*! \reimp from EncryptJob */
+ /* from EncryptJob */
void setOutputIsBase64Encoded(bool on) Q_DECL_OVERRIDE;
- /*! \reimp from ThreadedJobMixin */
+ /* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:
diff --git a/lang/qt/src/qgpgmeexportjob.h b/lang/qt/src/qgpgmeexportjob.h
index 703687c..7561054 100644
--- a/lang/qt/src/qgpgmeexportjob.h
+++ b/lang/qt/src/qgpgmeexportjob.h
@@ -57,7 +57,7 @@ public:
explicit QGpgMEExportJob(GpgME::Context *context);
~QGpgMEExportJob();
- /*! \reimp from ExportJob */
+ /* from ExportJob */
GpgME::Error start(const QStringList &patterns) Q_DECL_OVERRIDE;
};
diff --git a/lang/qt/src/qgpgmeimportfromkeyserverjob.h b/lang/qt/src/qgpgmeimportfromkeyserverjob.h
index f50dae0..8c9f944 100644
--- a/lang/qt/src/qgpgmeimportfromkeyserverjob.h
+++ b/lang/qt/src/qgpgmeimportfromkeyserverjob.h
@@ -63,13 +63,13 @@ public:
explicit QGpgMEImportFromKeyserverJob(GpgME::Context *context);
~QGpgMEImportFromKeyserverJob();
- /*! \reimp from ImportFromKeyserverJob */
+ /* from ImportFromKeyserverJob */
GpgME::Error start(const std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE;
- /*! \reimp from ImportFromKeyserverJob */
+ /* from ImportFromKeyserverJob */
GpgME::ImportResult exec(const std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE;
- /*! \reimp from ThreadedJobMixin */
+ /* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:
diff --git a/lang/qt/src/qgpgmeimportjob.h b/lang/qt/src/qgpgmeimportjob.h
index 5a55fc9..424cb50 100644
--- a/lang/qt/src/qgpgmeimportjob.h
+++ b/lang/qt/src/qgpgmeimportjob.h
@@ -63,13 +63,13 @@ public:
explicit QGpgMEImportJob(GpgME::Context *context);
~QGpgMEImportJob();
- /*! \reimp from ImportJob */
+ /* from ImportJob */
GpgME::Error start(const QByteArray &keyData) Q_DECL_OVERRIDE;
- /*! \reimp from ImportJob */
+ /* from ImportJob */
GpgME::ImportResult exec(const QByteArray &keyData) Q_DECL_OVERRIDE;
- /*! \reimp from ThreadedJobMixin */
+ /* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:
diff --git a/lang/qt/src/qgpgmekeygenerationjob.h b/lang/qt/src/qgpgmekeygenerationjob.h
index fb09b03..808b714 100644
--- a/lang/qt/src/qgpgmekeygenerationjob.h
+++ b/lang/qt/src/qgpgmekeygenerationjob.h
@@ -63,7 +63,7 @@ public:
explicit QGpgMEKeyGenerationJob(GpgME::Context *context);
~QGpgMEKeyGenerationJob();
- /*! \reimp from KeygenerationJob */
+ /* from KeygenerationJob */
GpgME::Error start(const QString ¶meters) Q_DECL_OVERRIDE;
};
diff --git a/lang/qt/src/qgpgmekeylistjob.h b/lang/qt/src/qgpgmekeylistjob.h
index 292f2bb..cbe1e94 100644
--- a/lang/qt/src/qgpgmekeylistjob.h
+++ b/lang/qt/src/qgpgmekeylistjob.h
@@ -68,13 +68,13 @@ public:
explicit QGpgMEKeyListJob(GpgME::Context *context);
~QGpgMEKeyListJob();
- /*! \reimp from KeyListJob */
+ /* from KeyListJob */
GpgME::Error start(const QStringList &patterns, bool secretOnly) Q_DECL_OVERRIDE;
- /*! \reimp from KeyListJob */
+ /* from KeyListJob */
GpgME::KeyListResult exec(const QStringList &patterns, bool secretOnly, std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE;
- /*! \reimp from ThreadedJobMixin */
+ /* from ThreadedJobMixin */
void resultHook(const result_type &result) Q_DECL_OVERRIDE;
private:
diff --git a/lang/qt/src/qgpgmelistallkeysjob.h b/lang/qt/src/qgpgmelistallkeysjob.h
index 310eabd..1fc69d4 100644
--- a/lang/qt/src/qgpgmelistallkeysjob.h
+++ b/lang/qt/src/qgpgmelistallkeysjob.h
@@ -68,13 +68,13 @@ public:
explicit QGpgMEListAllKeysJob(GpgME::Context *context);
~QGpgMEListAllKeysJob();
- /*! \reimp from ListAllKeysJob */
+ /* from ListAllKeysJob */
GpgME::Error start(bool mergeKeys) Q_DECL_OVERRIDE;
- /*! \reimp from ListAllKeysJob */
+ /* from ListAllKeysJob */
GpgME::KeyListResult exec(std::vector<GpgME::Key> &pub, std::vector<GpgME::Key> &sec, bool mergeKeys) Q_DECL_OVERRIDE;
- /*! \reimp from ThreadedJobMixin */
+ /* from ThreadedJobMixin */
void resultHook(const result_type &result) Q_DECL_OVERRIDE;
private:
diff --git a/lang/qt/src/qgpgmerefreshkeysjob.h b/lang/qt/src/qgpgmerefreshkeysjob.h
index da928f3..2a54e38 100644
--- a/lang/qt/src/qgpgmerefreshkeysjob.h
+++ b/lang/qt/src/qgpgmerefreshkeysjob.h
@@ -54,11 +54,11 @@ public:
QGpgMERefreshKeysJob();
~QGpgMERefreshKeysJob();
- /*! \reimp from RefreshKeysJob */
+ /* from RefreshKeysJob */
GpgME::Error start(const QStringList &patterns) Q_DECL_OVERRIDE;
private Q_SLOTS:
- /*! \reimp from Job */
+ /* from Job */
void slotCancel() Q_DECL_OVERRIDE;
void slotStatus(QProcess *, const QString &, const QStringList &);
diff --git a/lang/qt/src/qgpgmesecretkeyexportjob.h b/lang/qt/src/qgpgmesecretkeyexportjob.h
index c58e853..ad53f99 100644
--- a/lang/qt/src/qgpgmesecretkeyexportjob.h
+++ b/lang/qt/src/qgpgmesecretkeyexportjob.h
@@ -57,11 +57,11 @@ public:
QGpgMESecretKeyExportJob(bool armour, const QString &charset);
~QGpgMESecretKeyExportJob();
- /*! \reimp from ExportJob */
+ /* from ExportJob */
GpgME::Error start(const QStringList &patterns) Q_DECL_OVERRIDE;
private Q_SLOTS:
- /*! \reimp from Job */
+ /* from Job */
void slotCancel() Q_DECL_OVERRIDE;
void slotStdout();
diff --git a/lang/qt/src/qgpgmesignencryptjob.h b/lang/qt/src/qgpgmesignencryptjob.h
index bf1439c..49177d3 100644
--- a/lang/qt/src/qgpgmesignencryptjob.h
+++ b/lang/qt/src/qgpgmesignencryptjob.h
@@ -75,12 +75,12 @@ public:
explicit QGpgMESignEncryptJob(GpgME::Context *context);
~QGpgMESignEncryptJob();
- /*! \reimp from SignEncryptJob */
+ /* from SignEncryptJob */
GpgME::Error start(const std::vector<GpgME::Key> &signers,
const std::vector<GpgME::Key> &recipients,
const QByteArray &plainText, bool alwaysTrust) Q_DECL_OVERRIDE;
- /*! \reimp from SignEncryptJob */
+ /* from SignEncryptJob */
void start(const std::vector<GpgME::Key> &signers,
const std::vector<GpgME::Key> &recipients,
const std::shared_ptr<QIODevice> &plainText,
@@ -93,10 +93,10 @@ public:
const QByteArray &plainText, bool alwaysTrust,
QByteArray &cipherText) Q_DECL_OVERRIDE;
- /*! \reimp from SignEncryptJob */
+ /* from SignEncryptJob */
void setOutputIsBase64Encoded(bool on) Q_DECL_OVERRIDE;
- /*! \reimp from ThreadedJobMixin */
+ /* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:
diff --git a/lang/qt/src/qgpgmesignjob.h b/lang/qt/src/qgpgmesignjob.h
index 8ad35ed..1d4a174 100644
--- a/lang/qt/src/qgpgmesignjob.h
+++ b/lang/qt/src/qgpgmesignjob.h
@@ -68,27 +68,27 @@ public:
explicit QGpgMESignJob(GpgME::Context *context);
~QGpgMESignJob();
- /*! \reimp from SignJob */
+ /* from SignJob */
GpgME::Error start(const std::vector<GpgME::Key> &signers,
const QByteArray &plainText,
GpgME::SignatureMode mode) Q_DECL_OVERRIDE;
- /*! \reimp from SignJob */
+ /* from SignJob */
void start(const std::vector<GpgME::Key> &signers,
const std::shared_ptr<QIODevice> &plainText,
const std::shared_ptr<QIODevice> &signature,
GpgME::SignatureMode mode) Q_DECL_OVERRIDE;
- /*! \reimp from SignJob */
+ /* from SignJob */
GpgME::SigningResult exec(const std::vector<GpgME::Key> &signers,
const QByteArray &plainText,
GpgME::SignatureMode mode,
QByteArray &signature) Q_DECL_OVERRIDE;
- /*! \reimp from SignJob */
+ /* from SignJob */
void setOutputIsBase64Encoded(bool on) Q_DECL_OVERRIDE;
- /*! \reimp from ThreadedJobMixin */
+ /* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:
diff --git a/lang/qt/src/qgpgmesignkeyjob.h b/lang/qt/src/qgpgmesignkeyjob.h
index 6b610ac..6cdb7db 100644
--- a/lang/qt/src/qgpgmesignkeyjob.h
+++ b/lang/qt/src/qgpgmesignkeyjob.h
@@ -63,22 +63,22 @@ public:
explicit QGpgMESignKeyJob(GpgME::Context *context);
~QGpgMESignKeyJob();
- /*! \reimp from SignKeyJob */
+ /* from SignKeyJob */
GpgME::Error start(const GpgME::Key &key) Q_DECL_OVERRIDE;
- /*! \reimp from SignKeyJob */
+ /* from SignKeyJob */
void setUserIDsToSign(const std::vector<unsigned int> &idsToSign) Q_DECL_OVERRIDE;
- /*! \reimp from SignKeyJob */
+ /* from SignKeyJob */
void setCheckLevel(unsigned int checkLevel) Q_DECL_OVERRIDE;
- /*! \reimp from SignKeyJob */
+ /* from SignKeyJob */
void setExportable(bool exportable) Q_DECL_OVERRIDE;
- /*! \reimp from SignKeyJob */
+ /* from SignKeyJob */
void setSigningKey(const GpgME::Key &key) Q_DECL_OVERRIDE;
- /*! \reimp from SignKeyJob */
+ /* from SignKeyJob */
void setNonRevocable(bool nonRevocable) Q_DECL_OVERRIDE;
private:
diff --git a/lang/qt/src/qgpgmeverifydetachedjob.h b/lang/qt/src/qgpgmeverifydetachedjob.h
index 6f6257c..051caf0 100644
--- a/lang/qt/src/qgpgmeverifydetachedjob.h
+++ b/lang/qt/src/qgpgmeverifydetachedjob.h
@@ -63,17 +63,17 @@ public:
explicit QGpgMEVerifyDetachedJob(GpgME::Context *context);
~QGpgMEVerifyDetachedJob();
- /*! \reimp from VerifyDetachedJob */
+ /* from VerifyDetachedJob */
GpgME::Error start(const QByteArray &signature, const QByteArray &signedData) Q_DECL_OVERRIDE;
- /*! \reimp from VerifyDetachedJob */
+ /* from VerifyDetachedJob */
void start(const std::shared_ptr<QIODevice> &signature, const std::shared_ptr<QIODevice> &signedData) Q_DECL_OVERRIDE;
- /*! \reimp from VerifyDetachedJob */
+ /* from VerifyDetachedJob */
GpgME::VerificationResult exec(const QByteArray &signature,
const QByteArray &signedData) Q_DECL_OVERRIDE;
- /*! \reimp from ThreadedJobMixin */
+ /* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:
diff --git a/lang/qt/src/qgpgmeverifyopaquejob.h b/lang/qt/src/qgpgmeverifyopaquejob.h
index 2374cee..87c94a3 100644
--- a/lang/qt/src/qgpgmeverifyopaquejob.h
+++ b/lang/qt/src/qgpgmeverifyopaquejob.h
@@ -63,16 +63,16 @@ public:
explicit QGpgMEVerifyOpaqueJob(GpgME::Context *context);
~QGpgMEVerifyOpaqueJob();
- /*! \reimp from VerifyOpaqueJob */
+ /* from VerifyOpaqueJob */
GpgME::Error start(const QByteArray &signedData) Q_DECL_OVERRIDE;
- /*! \reimp from VerifyOpaqueJob */
+ /* from VerifyOpaqueJob */
void start(const std::shared_ptr<QIODevice> &signedData, const std::shared_ptr<QIODevice> &plainText) Q_DECL_OVERRIDE;
- /*! \reimp form VerifyOpaqueJob */
+ /* form VerifyOpaqueJob */
GpgME::VerificationResult exec(const QByteArray &signedData, QByteArray &plainData) Q_DECL_OVERRIDE;
- /*! \reimp from ThreadedJobMixin */
+ /* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:
commit 56c4d9ea9520c95612e525b2fa1359db6fa88f4a
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue May 10 14:05:10 2016 +0200
Qt: Make Protocol class public API
* lang/qt/src/Makefile.am (qgpgme_headers): Add protocol.h
(private_qgpgme_headers): Add protocol_p.h
* lang/qt/src/protocol.h: New. From QGpgMEBackend.
* lang/qt/src/protocol_p.h: New. From QGpgMEBackend.
* lang/qt/src/qgpgmebackend.h,
lang/qt/src/qgpgmebackend.cpp (Protocol): Removed.
--
The backend class does not make much sense anymore as we
only have the GpgME backend obviously. It's purpose was
for Libkleo's Backend abstraction.
diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am
index 30c24b9..7de3ef6 100644
--- a/lang/qt/src/Makefile.am
+++ b/lang/qt/src/Makefile.am
@@ -49,6 +49,7 @@ qgpgme_headers= \
hierarchicalkeylistjob.h \
job.h \
multideletejob.h \
+ protocol.h \
qgpgme_export.h \
qgpgmenewcryptoconfig.h \
signjob.h \
@@ -67,6 +68,7 @@ qgpgme_headers= \
private_qgpgme_headers = \
qgpgme_export.h \
abstractimportjob.h \
+ protocol_p.h \
qgpgmeadduseridjob.h \
qgpgmebackend.h \
qgpgmechangeexpiryjob.h \
diff --git a/lang/qt/src/qgpgmebackend.h b/lang/qt/src/protocol.h
similarity index 77%
copy from lang/qt/src/qgpgmebackend.h
copy to lang/qt/src/protocol.h
index 3b03633..5162fe6 100644
--- a/lang/qt/src/qgpgmebackend.h
+++ b/lang/qt/src/protocol.h
@@ -1,5 +1,5 @@
/*
- qgpgmebackend.h
+ protocol.h
This file is part of qgpgme, the Qt API binding for gpgme
Copyright (c) 2004,2005 Klarälvdalens Datakonsult AB
@@ -30,14 +30,15 @@
you do not wish to do so, delete this exception statement from
your version.
*/
-
-#ifndef __QGPGME_QGPGMEBACKEND_H__
-#define __QGPGME_QGPGMEBACKEND_H__
+#ifndef __QGPGME_PROTOCOL_H__
+#define __QGPGME_PROTOCOL_H__
#include <QString>
+#include <QVariant>
-namespace QGpgME
-{
+#include "qgpgme_export.h"
+
+namespace QGpgME {
class CryptoConfig;
class KeyListJob;
class ListAllKeysJob;
@@ -61,72 +62,8 @@ class ChangeOwnerTrustJob;
class ChangePasswdJob;
class AddUserIDJob;
class SpecialJob;
-}
-class QString;
-class QVariant;
-template <typename T_Key, typename T_Value> class QMap;
-
-namespace QGpgME
-{
-class CryptoConfig;
-class Protocol;
-
-/** Obtain a reference to the OpenPGP Protocol.
- *
- * The reference is to a static object.
- * @returns Refrence to the OpenPGP Protocol.
- */
-Protocol *openpgp();
-
-/** Obtain a reference to the smime Protocol.
- *
- * The reference is to a static object.
- * @returns Refrence to the smime Protocol.
- */
-Protocol *smime();
-
-class QGpgMEBackend
-{
-public:
- QGpgMEBackend();
- ~QGpgMEBackend();
-
- QString name() const;
- QString displayName() const;
-
- CryptoConfig *config() const;
-
- Protocol *openpgp() const;
- Protocol *smime() const;
- Protocol *protocol(const char *name) const;
-
- static const char OpenPGP[];
- static const char SMIME[];
-
- bool checkForOpenPGP(QString *reason = Q_NULLPTR) const;
- bool checkForSMIME(QString *reason = Q_NULLPTR) const;
- bool checkForProtocol(const char *name, QString *reason) const;
-
- bool supportsOpenPGP() const
- {
- return true;
- }
- bool supportsSMIME() const
- {
- return true;
- }
- bool supportsProtocol(const char *name) const;
-
- const char *enumerateProtocols(int i) const;
-
-private:
- mutable QGpgME::CryptoConfig *mCryptoConfig;
- mutable Protocol *mOpenPGPProtocol;
- mutable Protocol *mSMIMEProtocol;
-};
-
-class Protocol
+class QGPGME_EXPORT Protocol
{
public:
virtual ~Protocol() {}
@@ -161,6 +98,26 @@ public:
virtual SpecialJob *specialJob(const char *type, const QMap<QString, QVariant> &args) const = 0;
};
-}
+/** Obtain a reference to the OpenPGP Protocol.
+ *
+ * The reference is to a static object.
+ * @returns Refrence to the OpenPGP Protocol.
+ */
+QGPGME_EXPORT Protocol *openpgp();
+
+/** Obtain a reference to the smime Protocol.
+ *
+ * The reference is to a static object.
+ * @returns Refrence to the smime Protocol.
+ */
+QGPGME_EXPORT Protocol *smime();
+
+/** Obtain a reference to a cryptoConfig object.
+ *
+ * The reference is to a static object.
+ * @returns reference to cryptoConfig object.
+ */
+QGPGME_EXPORT CryptoConfig *cryptoConfig();
-#endif // __QGPGME_QGPGMEBACKEND_H__
+}
+#endif
diff --git a/lang/qt/src/qgpgmebackend.cpp b/lang/qt/src/protocol_p.h
similarity index 74%
copy from lang/qt/src/qgpgmebackend.cpp
copy to lang/qt/src/protocol_p.h
index 27cd178..d6c5625 100644
--- a/lang/qt/src/qgpgmebackend.cpp
+++ b/lang/qt/src/protocol_p.h
@@ -1,5 +1,5 @@
/*
- qgpgmebackend.cpp
+ protocol_p.h
This file is part of qgpgme, the Qt API binding for gpgme
Copyright (c) 2004,2005 Klarälvdalens Datakonsult AB
@@ -30,9 +30,8 @@
you do not wish to do so, delete this exception statement from
your version.
*/
-
-#include "qgpgmebackend.h"
-
+#ifndef __QGPGME_PROTOCOL_P_H__
+#define __QGPGME_PROTOCOL_P_H__
#include "qgpgmenewcryptoconfig.h"
#include "qgpgmekeygenerationjob.h"
@@ -58,15 +57,6 @@
#include "qgpgmechangepasswdjob.h"
#include "qgpgmeadduseridjob.h"
-#include "error.h"
-#include "engineinfo.h"
-
-#include <QFile>
-#include <QString>
-
-const char QGpgME::QGpgMEBackend::OpenPGP[] = "OpenPGP";
-const char QGpgME::QGpgMEBackend::SMIME[] = "SMIME";
-
namespace
{
@@ -378,150 +368,4 @@ public:
};
}
-
-QGpgME::QGpgMEBackend::QGpgMEBackend()
- : mCryptoConfig(0),
- mOpenPGPProtocol(0),
- mSMIMEProtocol(0)
-{
- GpgME::initializeLibrary();
-}
-
-QGpgME::QGpgMEBackend::~QGpgMEBackend()
-{
- delete mCryptoConfig; mCryptoConfig = 0;
- delete mOpenPGPProtocol; mOpenPGPProtocol = 0;
- delete mSMIMEProtocol; mSMIMEProtocol = 0;
-}
-
-QString QGpgME::QGpgMEBackend::name() const
-{
- return QStringLiteral("gpgme");
-}
-
-QString QGpgME::QGpgMEBackend::displayName() const
-{
- return QStringLiteral("GpgME");
-}
-
-QGpgME::CryptoConfig *QGpgME::QGpgMEBackend::config() const
-{
- if (!mCryptoConfig) {
- if (GpgME::hasFeature(GpgME::GpgConfEngineFeature, 0)) {
- mCryptoConfig = new QGpgMENewCryptoConfig;
- }
- }
- return mCryptoConfig;
-}
-
-static bool check(GpgME::Protocol proto, QString *reason)
-{
- if (!GpgME::checkEngine(proto)) {
- return true;
- }
- if (!reason) {
- return false;
- }
- // error, check why:
-#if 0
-Port away from localised string or delete.
- const GpgME::EngineInfo ei = GpgME::engineInfo(proto);
- if (ei.isNull()) {
- *reason = i18n("GPGME was compiled without support for %1.", proto == GpgME::CMS ? QLatin1String("S/MIME") : QLatin1String("OpenPGP"));
- } else if (ei.fileName() && !ei.version()) {
- *reason = i18n("Engine %1 is not installed properly.", QFile::decodeName(ei.fileName()));
- } else if (ei.fileName() && ei.version() && ei.requiredVersion())
- *reason = i18n("Engine %1 version %2 installed, "
- "but at least version %3 is required.",
- QFile::decodeName(ei.fileName()), QLatin1String(ei.version()), QLatin1String(ei.requiredVersion()));
- else {
- *reason = i18n("Unknown problem with engine for protocol %1.", proto == GpgME::CMS ? QLatin1String("S/MIME") : QLatin1String("OpenPGP"));
- }
#endif
- return false;
-}
-
-bool QGpgME::QGpgMEBackend::checkForOpenPGP(QString *reason) const
-{
- return check(GpgME::OpenPGP, reason);
-}
-
-bool QGpgME::QGpgMEBackend::checkForSMIME(QString *reason) const
-{
- return check(GpgME::CMS, reason);
-}
-
-bool QGpgME::QGpgMEBackend::checkForProtocol(const char *name, QString *reason) const
-{
- if (qstricmp(name, OpenPGP) == 0) {
- return check(GpgME::OpenPGP, reason);
- }
- if (qstricmp(name, SMIME) == 0) {
- return check(GpgME::CMS, reason);
- }
- if (reason) {
- *reason = QStringLiteral("Unsupported protocol \"%1\"").arg(QLatin1String(name));
- }
- return false;
-}
-
-QGpgME::Protocol *QGpgME::QGpgMEBackend::openpgp() const
-{
- if (!mOpenPGPProtocol)
- if (checkForOpenPGP()) {
- mOpenPGPProtocol = new ::Protocol(GpgME::OpenPGP);
- }
- return mOpenPGPProtocol;
-}
-
-QGpgME::Protocol *QGpgME::QGpgMEBackend::smime() const
-{
- if (!mSMIMEProtocol)
- if (checkForSMIME()) {
- mSMIMEProtocol = new ::Protocol(GpgME::CMS);
- }
- return mSMIMEProtocol;
-}
-
-QGpgME::Protocol *QGpgME::QGpgMEBackend::protocol(const char *name) const
-{
- if (qstricmp(name, OpenPGP) == 0) {
- return openpgp();
- }
- if (qstricmp(name, SMIME) == 0) {
- return smime();
- }
- return 0;
-}
-
-bool QGpgME::QGpgMEBackend::supportsProtocol(const char *name) const
-{
- return qstricmp(name, OpenPGP) == 0 || qstricmp(name, SMIME) == 0;
-}
-
-const char *QGpgME::QGpgMEBackend::enumerateProtocols(int i) const
-{
- switch (i) {
- case 0: return OpenPGP;
- case 1: return SMIME;
- default: return 0;
- }
-}
-
-static QGpgME::QGpgMEBackend *gpgmeBackend;
-
-QGpgME::Protocol *QGpgME::openpgp()
-{
- if (!gpgmeBackend) {
- gpgmeBackend = new QGpgME::QGpgMEBackend();
- }
- return gpgmeBackend->openpgp();
-}
-
-QGpgME::Protocol *QGpgME::smime()
-{
- if (!gpgmeBackend) {
- gpgmeBackend = new QGpgME::QGpgMEBackend();
- }
- return gpgmeBackend->smime();
-}
diff --git a/lang/qt/src/qgpgmebackend.cpp b/lang/qt/src/qgpgmebackend.cpp
index 27cd178..797e58a 100644
--- a/lang/qt/src/qgpgmebackend.cpp
+++ b/lang/qt/src/qgpgmebackend.cpp
@@ -33,351 +33,18 @@
#include "qgpgmebackend.h"
-#include "qgpgmenewcryptoconfig.h"
-
-#include "qgpgmekeygenerationjob.h"
-#include "qgpgmekeylistjob.h"
-#include "qgpgmelistallkeysjob.h"
-#include "qgpgmedecryptjob.h"
-#include "qgpgmedecryptverifyjob.h"
-#include "qgpgmerefreshkeysjob.h"
-#include "qgpgmedeletejob.h"
-#include "qgpgmesecretkeyexportjob.h"
-#include "qgpgmedownloadjob.h"
-#include "qgpgmesignencryptjob.h"
-#include "qgpgmeencryptjob.h"
-#include "qgpgmesignjob.h"
-#include "qgpgmesignkeyjob.h"
-#include "qgpgmeexportjob.h"
-#include "qgpgmeverifydetachedjob.h"
-#include "qgpgmeimportjob.h"
-#include "qgpgmeimportfromkeyserverjob.h"
-#include "qgpgmeverifyopaquejob.h"
-#include "qgpgmechangeexpiryjob.h"
-#include "qgpgmechangeownertrustjob.h"
-#include "qgpgmechangepasswdjob.h"
-#include "qgpgmeadduseridjob.h"
#include "error.h"
#include "engineinfo.h"
+#include "protocol_p.h"
+
#include <QFile>
#include <QString>
const char QGpgME::QGpgMEBackend::OpenPGP[] = "OpenPGP";
const char QGpgME::QGpgMEBackend::SMIME[] = "SMIME";
-namespace
-{
-
-class Protocol : public QGpgME::Protocol
-{
- GpgME::Protocol mProtocol;
-public:
- explicit Protocol(GpgME::Protocol proto) : mProtocol(proto) {}
-
- QString name() const Q_DECL_OVERRIDE
- {
- switch (mProtocol) {
- case GpgME::OpenPGP: return QStringLiteral("OpenPGP");
- case GpgME::CMS: return QStringLiteral("SMIME");
- default: return QString();
- }
- }
-
- QString displayName() const Q_DECL_OVERRIDE
- {
- // ah (2.4.16): Where is this used and isn't this inverted
- // with name
- switch (mProtocol) {
- case GpgME::OpenPGP: return QStringLiteral("gpg");
- case GpgME::CMS: return QStringLiteral("gpgsm");
- default: return QStringLiteral("unknown");
- }
- }
-
- QGpgME::SpecialJob *specialJob(const char *, const QMap<QString, QVariant> &) const Q_DECL_OVERRIDE
- {
- return 0;
- }
-
- QGpgME::KeyListJob *keyListJob(bool remote, bool includeSigs, bool validate) const Q_DECL_OVERRIDE
- {
- GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
- if (!context) {
- return 0;
- }
-
- unsigned int mode = context->keyListMode();
- if (remote) {
- mode |= GpgME::Extern;
- mode &= ~GpgME::Local;
- } else {
- mode |= GpgME::Local;
- mode &= ~GpgME::Extern;
- }
- if (includeSigs) {
- mode |= GpgME::Signatures;
- }
- if (validate) {
- mode |= GpgME::Validate;
- }
- context->setKeyListMode(mode);
- return new QGpgME::QGpgMEKeyListJob(context);
- }
-
- QGpgME::ListAllKeysJob *listAllKeysJob(bool includeSigs, bool validate) const Q_DECL_OVERRIDE
- {
- GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
- if (!context) {
- return 0;
- }
-
- unsigned int mode = context->keyListMode();
- mode |= GpgME::Local;
- mode &= ~GpgME::Extern;
- if (includeSigs) {
- mode |= GpgME::Signatures;
- }
- if (validate) {
- mode |= GpgME::Validate;
- /* Setting the context to offline mode disables CRL / OCSP checks in
- this Job. Otherwise we would try to fetch the CRL's for all CMS
- keys in the users keyring because GpgME::Validate includes remote
- resources by default in the validity check.
- This setting only has any effect if gpgsm >= 2.1.6 is used.
- */
- context->setOffline(true);
- }
- context->setKeyListMode(mode);
- return new QGpgME::QGpgMEListAllKeysJob(context);
- }
-
- QGpgME::EncryptJob *encryptJob(bool armor, bool textmode) const Q_DECL_OVERRIDE
- {
- GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
- if (!context) {
- return 0;
- }
-
- context->setArmor(armor);
- context->setTextMode(textmode);
- return new QGpgME::QGpgMEEncryptJob(context);
- }
-
- QGpgME::DecryptJob *decryptJob() const Q_DECL_OVERRIDE
- {
- GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
- if (!context) {
- return 0;
- }
- return new QGpgME::QGpgMEDecryptJob(context);
- }
-
- QGpgME::SignJob *signJob(bool armor, bool textMode) const Q_DECL_OVERRIDE
- {
- GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
- if (!context) {
- return 0;
- }
-
- context->setArmor(armor);
- context->setTextMode(textMode);
- return new QGpgME::QGpgMESignJob(context);
- }
-
- QGpgME::VerifyDetachedJob *verifyDetachedJob(bool textMode) const Q_DECL_OVERRIDE
- {
- GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
- if (!context) {
- return 0;
- }
-
- context->setTextMode(textMode);
- return new QGpgME::QGpgMEVerifyDetachedJob(context);
- }
-
- QGpgME::VerifyOpaqueJob *verifyOpaqueJob(bool textMode) const Q_DECL_OVERRIDE
- {
- GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
- if (!context) {
- return 0;
- }
-
- context->setTextMode(textMode);
- return new QGpgME::QGpgMEVerifyOpaqueJob(context);
- }
-
- QGpgME::KeyGenerationJob *keyGenerationJob() const Q_DECL_OVERRIDE
- {
- GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
- if (!context) {
- return 0;
- }
- return new QGpgME::QGpgMEKeyGenerationJob(context);
- }
-
- QGpgME::ImportJob *importJob() const Q_DECL_OVERRIDE
- {
- GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
- if (!context) {
- return 0;
- }
- return new QGpgME::QGpgMEImportJob(context);
- }
-
- QGpgME::ImportFromKeyserverJob *importFromKeyserverJob() const Q_DECL_OVERRIDE
- {
- GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
- if (!context) {
- return 0;
- }
- return new QGpgME::QGpgMEImportFromKeyserverJob(context);
- }
-
- QGpgME::ExportJob *publicKeyExportJob(bool armor) const Q_DECL_OVERRIDE
- {
- GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
- if (!context) {
- return 0;
- }
-
- context->setArmor(armor);
- return new QGpgME::QGpgMEExportJob(context);
- }
-
- QGpgME::ExportJob *secretKeyExportJob(bool armor, const QString &charset) const Q_DECL_OVERRIDE
- {
- if (mProtocol != GpgME::CMS) { // fixme: add support for gpg, too
- return 0;
- }
-
- // this operation is not supported by gpgme, so we have to call gpgsm ourselves:
- return new QGpgME::QGpgMESecretKeyExportJob(armor, charset);
- }
-
- QGpgME::RefreshKeysJob *refreshKeysJob() const Q_DECL_OVERRIDE
- {
- if (mProtocol != GpgME::CMS) { // fixme: add support for gpg, too
- return 0;
- }
-
- // this operation is not supported by gpgme, so we have to call gpgsm ourselves:
- return new QGpgME::QGpgMERefreshKeysJob();
- }
-
- QGpgME::DownloadJob *downloadJob(bool armor) const Q_DECL_OVERRIDE
- {
- GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
- if (!context) {
- return 0;
- }
-
- context->setArmor(armor);
- // this is the hackish interface for downloading from keyserers currently:
- context->setKeyListMode(GpgME::Extern);
- return new QGpgME::QGpgMEDownloadJob(context);
- }
-
- QGpgME::DeleteJob *deleteJob() const Q_DECL_OVERRIDE
- {
- GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
- if (!context) {
- return 0;
- }
- return new QGpgME::QGpgMEDeleteJob(context);
- }
-
- QGpgME::SignEncryptJob *signEncryptJob(bool armor, bool textMode) const Q_DECL_OVERRIDE
- {
- GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
- if (!context) {
- return 0;
- }
-
- context->setArmor(armor);
- context->setTextMode(textMode);
- return new QGpgME::QGpgMESignEncryptJob(context);
- }
-
- QGpgME::DecryptVerifyJob *decryptVerifyJob(bool textMode) const Q_DECL_OVERRIDE
- {
- GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
- if (!context) {
- return 0;
- }
-
- context->setTextMode(textMode);
- return new QGpgME::QGpgMEDecryptVerifyJob(context);
- }
-
- QGpgME::ChangeExpiryJob *changeExpiryJob() const Q_DECL_OVERRIDE
- {
- if (mProtocol != GpgME::OpenPGP) {
- return 0; // only supported by gpg
- }
-
- GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
- if (!context) {
- return 0;
- }
- return new QGpgME::QGpgMEChangeExpiryJob(context);
- }
-
- QGpgME::ChangePasswdJob *changePasswdJob() const Q_DECL_OVERRIDE
- {
- if (!GpgME::hasFeature(GpgME::PasswdFeature, 0)) {
- return 0;
- }
- GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
- if (!context) {
- return 0;
- }
- return new QGpgME::QGpgMEChangePasswdJob(context);
- }
-
- QGpgME::SignKeyJob *signKeyJob() const Q_DECL_OVERRIDE
- {
- if (mProtocol != GpgME::OpenPGP) {
- return 0; // only supported by gpg
- }
-
- GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
- if (!context) {
- return 0;
- }
- return new QGpgME::QGpgMESignKeyJob(context);
- }
-
- QGpgME::ChangeOwnerTrustJob *changeOwnerTrustJob() const Q_DECL_OVERRIDE
- {
- if (mProtocol != GpgME::OpenPGP) {
- return 0; // only supported by gpg
- }
-
- GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
- if (!context) {
- return 0;
- }
- return new QGpgME::QGpgMEChangeOwnerTrustJob(context);
- }
-
- QGpgME::AddUserIDJob *addUserIDJob() const Q_DECL_OVERRIDE
- {
- if (mProtocol != GpgME::OpenPGP) {
- return 0; // only supported by gpg
- }
-
- GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
- if (!context) {
- return 0;
- }
- return new QGpgME::QGpgMEAddUserIDJob(context);
- }
-
-};
-
-}
QGpgME::QGpgMEBackend::QGpgMEBackend()
: mCryptoConfig(0),
@@ -510,6 +177,15 @@ const char *QGpgME::QGpgMEBackend::enumerateProtocols(int i) const
static QGpgME::QGpgMEBackend *gpgmeBackend;
+QGpgME::CryptoConfig *QGpgME::cryptoConfig()
+{
+ if (!gpgmeBackend) {
+ gpgmeBackend = new QGpgME::QGpgMEBackend();
+ }
+ return gpgmeBackend->config();
+
+}
+
QGpgME::Protocol *QGpgME::openpgp()
{
if (!gpgmeBackend) {
diff --git a/lang/qt/src/qgpgmebackend.h b/lang/qt/src/qgpgmebackend.h
index 3b03633..cca8b71 100644
--- a/lang/qt/src/qgpgmebackend.h
+++ b/lang/qt/src/qgpgmebackend.h
@@ -36,35 +36,9 @@
#include <QString>
-namespace QGpgME
-{
-class CryptoConfig;
-class KeyListJob;
-class ListAllKeysJob;
-class KeyGenerationJob;
-class ImportJob;
-class ImportFromKeyserverJob;
-class ExportJob;
-class DownloadJob;
-class DeleteJob;
-class EncryptJob;
-class DecryptJob;
-class SignJob;
-class SignKeyJob;
-class VerifyDetachedJob;
-class VerifyOpaqueJob;
-class SignEncryptJob;
-class DecryptVerifyJob;
-class RefreshKeysJob;
-class ChangeExpiryJob;
-class ChangeOwnerTrustJob;
-class ChangePasswdJob;
-class AddUserIDJob;
-class SpecialJob;
-}
+#include "protocol.h"
class QString;
-class QVariant;
template <typename T_Key, typename T_Value> class QMap;
namespace QGpgME
@@ -72,19 +46,6 @@ namespace QGpgME
class CryptoConfig;
class Protocol;
-/** Obtain a reference to the OpenPGP Protocol.
- *
- * The reference is to a static object.
- * @returns Refrence to the OpenPGP Protocol.
- */
-Protocol *openpgp();
-
-/** Obtain a reference to the smime Protocol.
- *
- * The reference is to a static object.
- * @returns Refrence to the smime Protocol.
- */
-Protocol *smime();
class QGpgMEBackend
{
@@ -126,41 +87,6 @@ private:
mutable Protocol *mSMIMEProtocol;
};
-class Protocol
-{
-public:
- virtual ~Protocol() {}
-
- virtual QString name() const = 0;
-
- virtual QString displayName() const = 0;
-
- virtual KeyListJob *keyListJob(bool remote = false, bool includeSigs = false, bool validate = false) const = 0;
- virtual ListAllKeysJob *listAllKeysJob(bool includeSigs = false, bool validate = false) const = 0;
- virtual EncryptJob *encryptJob(bool armor = false, bool textmode = false) const = 0;
- virtual DecryptJob *decryptJob() const = 0;
- virtual SignJob *signJob(bool armor = false, bool textMode = false) const = 0;
- virtual VerifyDetachedJob *verifyDetachedJob(bool textmode = false) const = 0;
- virtual VerifyOpaqueJob *verifyOpaqueJob(bool textmode = false) const = 0;
- virtual KeyGenerationJob *keyGenerationJob() const = 0;
- virtual ImportJob *importJob() const = 0;
- virtual ImportFromKeyserverJob *importFromKeyserverJob() const = 0;
- virtual ExportJob *publicKeyExportJob(bool armor = false) const = 0;
- // @param charset the encoding of the passphrase in the exported file
- virtual ExportJob *secretKeyExportJob(bool armor = false, const QString &charset = QString()) const = 0;
- virtual DownloadJob *downloadJob(bool armor = false) const = 0;
- virtual DeleteJob *deleteJob() const = 0;
- virtual SignEncryptJob *signEncryptJob(bool armor = false, bool textMode = false) const = 0;
- virtual DecryptVerifyJob *decryptVerifyJob(bool textmode = false) const = 0;
- virtual RefreshKeysJob *refreshKeysJob() const = 0;
- virtual ChangeExpiryJob *changeExpiryJob() const = 0;
- virtual SignKeyJob *signKeyJob() const = 0;
- virtual ChangePasswdJob *changePasswdJob() const = 0;
- virtual ChangeOwnerTrustJob *changeOwnerTrustJob() const = 0;
- virtual AddUserIDJob *addUserIDJob() const = 0;
- virtual SpecialJob *specialJob(const char *type, const QMap<QString, QVariant> &args) const = 0;
-};
-
}
#endif // __QGPGME_QGPGMEBACKEND_H__
commit 97225bb01cd2ffa1d84c7fedbc577275de4a4893
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue May 10 12:52:43 2016 +0200
Qt: Make doxygen quieter
* lang/qt/doc/Doxyfile.in: Quiet and no undocumented warnings.
diff --git a/lang/qt/doc/Doxyfile.in b/lang/qt/doc/Doxyfile.in
index b3b2fda..ef0a5c0 100644
--- a/lang/qt/doc/Doxyfile.in
+++ b/lang/qt/doc/Doxyfile.in
@@ -693,7 +693,7 @@ CITE_BIB_FILES =
# messages are off.
# The default value is: NO.
-QUIET = NO
+QUIET = YES
# The WARNINGS tag can be used to turn on/off the warning messages that are
# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
@@ -709,7 +709,7 @@ WARNINGS = YES
# will automatically be disabled.
# The default value is: YES.
-WARN_IF_UNDOCUMENTED = YES
+WARN_IF_UNDOCUMENTED = NO
# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
# potential errors in the documentation, such as not documenting some parameters
commit 740f92a7b83389ee9bde98b7bd25556793500b8b
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue May 10 12:47:53 2016 +0200
Qt: Only install public headers
* lang/qt/src/Makefile.am: Do not install all headers.
--
The qgpgme classes hide the implementation and thus make it
easier to change it without ABI breaks. They should not
be installed.
diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am
index 6435983..30c24b9 100644
--- a/lang/qt/src/Makefile.am
+++ b/lang/qt/src/Makefile.am
@@ -35,29 +35,38 @@ qgpgme_sources = \
qgpgmeverifyopaquejob.cpp threadedjobmixin.cpp \
gpgme_backend_debug.cpp
-qgpgme_headers = \
- qgpgme_export.h \
- abstractimportjob.h \
+qgpgme_headers= \
adduseridjob.h \
changeexpiryjob.h \
changeownertrustjob.h \
changepasswdjob.h \
- cryptoconfig.h \
dataprovider.h \
decryptjob.h \
decryptverifyjob.h \
- deletejob.h \
downloadjob.h \
encryptjob.h \
exportjob.h \
hierarchicalkeylistjob.h \
+ job.h \
+ multideletejob.h \
+ qgpgme_export.h \
+ qgpgmenewcryptoconfig.h \
+ signjob.h \
+ signkeyjob.h \
+ signencryptjob.h \
+ verifyopaquejob.h \
+ refreshkeysjob.h \
+ cryptoconfig.h \
+ deletejob.h \
importfromkeyserverjob.h \
importjob.h \
- job.h \
keygenerationjob.h \
keylistjob.h \
- listallkeysjob.h \
- multideletejob.h \
+ listallkeysjob.h
+
+private_qgpgme_headers = \
+ qgpgme_export.h \
+ abstractimportjob.h \
qgpgmeadduseridjob.h \
qgpgmebackend.h \
qgpgmechangeexpiryjob.h \
@@ -74,7 +83,6 @@ qgpgme_headers = \
qgpgmekeygenerationjob.h \
qgpgmekeylistjob.h \
qgpgmelistallkeysjob.h \
- qgpgmenewcryptoconfig.h \
qgpgmerefreshkeysjob.h \
qgpgmesecretkeyexportjob.h \
qgpgmesignencryptjob.h \
@@ -82,14 +90,8 @@ qgpgme_headers = \
qgpgmesignkeyjob.h \
qgpgmeverifydetachedjob.h \
qgpgmeverifyopaquejob.h \
- refreshkeysjob.h \
- signencryptjob.h \
- signjob.h \
- signkeyjob.h \
specialjob.h \
- threadedjobmixin.h \
- verifydetachedjob.h \
- verifyopaquejob.h
+ threadedjobmixin.h
qgpgme_moc_sources = \
abstractimportjob.moc \
@@ -144,7 +146,7 @@ qgpgme_moc_sources = \
qgpgmeincludedir = $(includedir)/qgpgme
qgpgmeinclude_HEADERS = $(qgpgme_headers)
-libqgpgme_la_SOURCES = $(qgpgme_sources) $(qgpgme_headers)
+libqgpgme_la_SOURCES = $(qgpgme_sources) $(qgpgme_headers) $(private_qgpgme_headers)
AM_CPPFLAGS = @GPGME_QT_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \
-DBUILDING_QGPGME -I$(top_srcdir)/lang/cpp/src
commit 0e3195948ddaba3af07d2415bb496491076edc17
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri May 6 16:33:49 2016 +0200
Qt: Add test for async keylisting
* src/lang/qt/tests/t-keylist.cpp(KeyListTest::testKeyListAsync): New.
diff --git a/lang/qt/tests/t-keylist.cpp b/lang/qt/tests/t-keylist.cpp
index 8aa5999..f5c7f13 100644
--- a/lang/qt/tests/t-keylist.cpp
+++ b/lang/qt/tests/t-keylist.cpp
@@ -1,15 +1,20 @@
#include <QDebug>
#include <QTest>
+#include <QSignalSpy>
#include "keylistjob.h"
#include "qgpgmebackend.h"
#include "keylistresult.h"
using namespace QGpgME;
+using namespace GpgME;
class KeyListTest : public QObject
{
Q_OBJECT
+Q_SIGNALS:
+ void asyncDone();
+
private Q_SLOTS:
void testSingleKeyListSync()
@@ -24,6 +29,19 @@ private Q_SLOTS:
Q_ASSERT (kId == QStringLiteral("2D727CC768697734"));
}
+ void testKeyListAsync()
+ {
+ KeyListJob *job = openpgp()->keyListJob();
+ connect(job, &KeyListJob::result, job, [this, job](KeyListResult, std::vector<Key> keys, QString, Error)
+ {
+ Q_ASSERT(keys.size() == 1);
+ Q_EMIT asyncDone();
+ });
+ job->start(QStringList() << "alfa at example.net");
+ QSignalSpy spy (this, &KeyListTest::asyncDone);
+ Q_ASSERT(spy.wait());
+ }
+
void initTestCase()
{
const QString gpgHome = qgetenv("GNUPGHOME");
-----------------------------------------------------------------------
Summary of changes:
lang/qt/doc/Doxyfile.in | 4 +-
lang/qt/src/Makefile.am | 38 +--
lang/qt/src/dataprovider.h | 10 -
lang/qt/src/hierarchicalkeylistjob.h | 2 +-
lang/qt/src/multideletejob.h | 2 +-
lang/qt/src/{qgpgmebackend.h => protocol.h} | 103 ++-----
lang/qt/src/{qgpgmebackend.cpp => protocol_p.h} | 162 +----------
lang/qt/src/qgpgmeadduseridjob.h | 2 +-
lang/qt/src/qgpgmebackend.cpp | 346 +-----------------------
lang/qt/src/qgpgmebackend.h | 76 +-----
lang/qt/src/qgpgmechangeexpiryjob.h | 2 +-
lang/qt/src/qgpgmechangeownertrustjob.h | 2 +-
lang/qt/src/qgpgmechangepasswdjob.h | 2 +-
lang/qt/src/qgpgmedecryptjob.h | 8 +-
lang/qt/src/qgpgmedecryptverifyjob.h | 8 +-
lang/qt/src/qgpgmedeletejob.h | 2 +-
lang/qt/src/qgpgmedownloadjob.h | 4 +-
lang/qt/src/qgpgmeencryptjob.h | 10 +-
lang/qt/src/qgpgmeexportjob.h | 2 +-
lang/qt/src/qgpgmeimportfromkeyserverjob.h | 6 +-
lang/qt/src/qgpgmeimportjob.h | 6 +-
lang/qt/src/qgpgmekeygenerationjob.h | 2 +-
lang/qt/src/qgpgmekeylistjob.h | 6 +-
lang/qt/src/qgpgmelistallkeysjob.h | 6 +-
lang/qt/src/qgpgmerefreshkeysjob.h | 4 +-
lang/qt/src/qgpgmesecretkeyexportjob.h | 4 +-
lang/qt/src/qgpgmesignencryptjob.h | 8 +-
lang/qt/src/qgpgmesignjob.h | 10 +-
lang/qt/src/qgpgmesignkeyjob.h | 12 +-
lang/qt/src/qgpgmeverifydetachedjob.h | 8 +-
lang/qt/src/qgpgmeverifyopaquejob.h | 8 +-
lang/qt/tests/t-keylist.cpp | 18 ++
32 files changed, 149 insertions(+), 734 deletions(-)
copy lang/qt/src/{qgpgmebackend.h => protocol.h} (77%)
copy lang/qt/src/{qgpgmebackend.cpp => protocol_p.h} (74%)
hooks/post-receive
--
GnuPG Made Easy
http://git.gnupg.org
More information about the Gnupg-commits
mailing list