aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Heinecke <[email protected]>2017-05-10 08:22:23 +0000
committerAndre Heinecke <[email protected]>2017-05-10 08:22:23 +0000
commitcc2ef3d07c0d261bb9e8e8c0f2706e1a08e4ec53 (patch)
treece5c04a5e43642a2726330de024627849580d4ca
parentqt, tests: Don't use internal API (diff)
downloadgpgme-cc2ef3d07c0d261bb9e8e8c0f2706e1a08e4ec53.tar.gz
gpgme-cc2ef3d07c0d261bb9e8e8c0f2706e1a08e4ec53.zip
qt: Undeprecate API that I find useful
* lang/qt/src/decryptjob.h, lang/qt/src/decryptverifyjob.h, lang/qt/src/signencryptjob.h, lang/qt/src/verifydetachedjob.h, lang/qt/src/verifyopaquejob.h: Undeprecate ByteArray based API. -- While an IODevice may be more performant the ByteArray API is a very easy way to get started with QGpgME as it allows you basically to encrypt / decrypt any QString. This also fixes a ton of deprecation warnings in KDE where this API is used all over the place.
-rw-r--r--lang/qt/src/decryptjob.h2
-rw-r--r--lang/qt/src/decryptverifyjob.h2
-rw-r--r--lang/qt/src/signencryptjob.h2
-rw-r--r--lang/qt/src/verifydetachedjob.h2
-rw-r--r--lang/qt/src/verifyopaquejob.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/lang/qt/src/decryptjob.h b/lang/qt/src/decryptjob.h
index 11584db2..7753e18b 100644
--- a/lang/qt/src/decryptjob.h
+++ b/lang/qt/src/decryptjob.h
@@ -76,7 +76,7 @@ public:
Starts the decryption operation. \a cipherText is the data to
decrypt.
*/
- virtual QGPGME_DEPRECATED_EXPORT GpgME::Error start(const QByteArray &cipherText) = 0;
+ virtual GpgME::Error start(const QByteArray &cipherText) = 0;
/*!
\overload
diff --git a/lang/qt/src/decryptverifyjob.h b/lang/qt/src/decryptverifyjob.h
index c3fcf025..e5c43464 100644
--- a/lang/qt/src/decryptverifyjob.h
+++ b/lang/qt/src/decryptverifyjob.h
@@ -77,7 +77,7 @@ public:
Starts the combined decryption and verification operation.
\a cipherText is the data to decrypt and later verify.
*/
- virtual QGPGME_DEPRECATED_EXPORT GpgME::Error start(const QByteArray &cipherText) = 0;
+ virtual GpgME::Error start(const QByteArray &cipherText) = 0;
/*!
\overload
diff --git a/lang/qt/src/signencryptjob.h b/lang/qt/src/signencryptjob.h
index 86e0a9d9..61ab5c69 100644
--- a/lang/qt/src/signencryptjob.h
+++ b/lang/qt/src/signencryptjob.h
@@ -95,7 +95,7 @@ public:
\em recipient keys will not be performed, but full validity
assumed for all \em recipient keys without further checks.
*/
- virtual QGPGME_DEPRECATED_EXPORT GpgME::Error start(const std::vector<GpgME::Key> &signers,
+ virtual GpgME::Error start(const std::vector<GpgME::Key> &signers,
const std::vector<GpgME::Key> &recipients,
const QByteArray &plainText,
bool alwaysTrust = false) = 0;
diff --git a/lang/qt/src/verifydetachedjob.h b/lang/qt/src/verifydetachedjob.h
index a9b7cf44..2293f3ad 100644
--- a/lang/qt/src/verifydetachedjob.h
+++ b/lang/qt/src/verifydetachedjob.h
@@ -78,7 +78,7 @@ public:
signature data, while \a signedData contains the data over
which the signature was made.
*/
- virtual QGPGME_DEPRECATED_EXPORT GpgME::Error start(const QByteArray &signature,
+ virtual GpgME::Error start(const QByteArray &signature,
const QByteArray &signedData) = 0;
/*!
diff --git a/lang/qt/src/verifyopaquejob.h b/lang/qt/src/verifyopaquejob.h
index 0ff85827..bfa34e92 100644
--- a/lang/qt/src/verifyopaquejob.h
+++ b/lang/qt/src/verifyopaquejob.h
@@ -77,7 +77,7 @@ public:
signature data, while \a signedData contains the data over
which the signature was made.
*/
- virtual QGPGME_DEPRECATED_EXPORT GpgME::Error start(const QByteArray &signedData) = 0;
+ virtual GpgME::Error start(const QByteArray &signedData) = 0;
/*!
\overload