diff options
author | Ingo Klöcker <[email protected]> | 2024-07-04 16:19:56 +0000 |
---|---|---|
committer | Ingo Klöcker <[email protected]> | 2024-07-05 08:05:51 +0000 |
commit | f6d020e24fb64cfba5e80cef7f80cad15f08cc3c (patch) | |
tree | f4b268730526013c6175cbe8d3cc0523fedb448c /lang/qt/src/util.h | |
parent | cpp: Deprecate Error::asString and update users (diff) | |
download | gpgme-f6d020e24fb64cfba5e80cef7f80cad15f08cc3c.tar.gz gpgme-f6d020e24fb64cfba5e80cef7f80cad15f08cc3c.zip |
qt: Replace usage of deprecated Error::asString
* lang/qt/src/debug.cpp (operator<<): Use Error::asStdString instead of
Error::asString.
* lang/qt/src/qgpgmedecryptverifyjob.cpp (decrypt_verify),
lang/qt/src/qgpgmenewcryptoconfig.cpp
(QGpgMENewCryptoConfigComponent::sync),
lang/qt/src/qgpgmewkdlookupjob.cpp (startDirmngr): Use QDebug operator
for Error instead of Error::asString.
* lang/qt/src/threadedjobmixin.cpp (_detail::audit_log_as_html): Use
errorAsString instead of Error::asString.
* lang/qt/src/util.h (errorAsString): New.
* lang/qt/tests/run-decryptverifyarchivejob.cpp (main),
lang/qt/tests/run-decryptverifyjob.cpp (main),
lang/qt/tests/run-encryptarchivejob.cpp (main),
lang/qt/tests/run-encryptjob.cpp (main),
lang/qt/tests/run-exportjob.cpp (main),
lang/qt/tests/run-importjob.cpp (main),
lang/qt/tests/run-receivekeysjob.cpp (main),
lang/qt/tests/run-refreshkeysjob.cpp (main),
lang/qt/tests/run-signarchivejob.cpp (main),
lang/qt/tests/run-signjob.cpp (main),
lang/qt/tests/run-verifydetachedjob.cpp (main),
lang/qt/tests/run-verifyopaquejob.cpp (main),
lang/qt/tests/run-wkdrefreshjob.cpp (main),
lang/qt/tests/t-ownertrust.cpp (testChangeOwnerTrust),
lang/qt/tests/t-remarks.cpp (testRemarkOwnKey),
lang/qt/tests/t-tofuinfo.cpp (testTofuPolicy): Use QDebug operator for
Error instead of Error::asString.
* lang/qt/tests/t-changeexpiryjob.cpp (all test functions),
lang/qt/tests/t-trustsignatures.cpp (all test functions),
lang/qt/tests/t-various.cpp (testSignKeyWithoutExpiration,
testSignKeyWithExpiration): Use errorAsString instead of
Error::asString.
--
GnuPG-bug-id: 7188
Diffstat (limited to 'lang/qt/src/util.h')
-rw-r--r-- | lang/qt/src/util.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/lang/qt/src/util.h b/lang/qt/src/util.h index cdf38981..fcd1187e 100644 --- a/lang/qt/src/util.h +++ b/lang/qt/src/util.h @@ -36,6 +36,8 @@ #include <QStringList> +#include <gpgme++/error.h> + #include <gpgme.h> #include <string> @@ -51,6 +53,15 @@ static inline gpgme_error_t make_error(gpgme_err_code_t code) return gpgme_err_make((gpgme_err_source_t)22, code); } +static inline QString errorAsString(const GpgME::Error &error) +{ +#ifdef Q_OS_WIN + return QString::fromStdString(error.asStdString()); +#else + return QString::fromLocal8Bit(error.asStdString().c_str()); +#endif +} + std::vector<std::string> toStrings(const QStringList &l); QStringList toFingerprints(const std::vector<GpgME::Key> &keys); |