diff --git a/lang/qt/src/dataprovider.h b/lang/qt/src/dataprovider.h index 165e4f4a..672980a8 100644 --- a/lang/qt/src/dataprovider.h +++ b/lang/qt/src/dataprovider.h @@ -25,10 +25,10 @@ #include "qgpgme_export.h" #include +#include #include -#include class QIODevice; diff --git a/lang/qt/src/decryptjob.h b/lang/qt/src/decryptjob.h index 04c603a4..2aa4661c 100644 --- a/lang/qt/src/decryptjob.h +++ b/lang/qt/src/decryptjob.h @@ -36,7 +36,7 @@ #include "job.h" -#include +#include class QByteArray; class QIODevice; diff --git a/lang/qt/src/decryptverifyjob.h b/lang/qt/src/decryptverifyjob.h index fa0d1d22..501df83c 100644 --- a/lang/qt/src/decryptverifyjob.h +++ b/lang/qt/src/decryptverifyjob.h @@ -36,7 +36,7 @@ #include "job.h" -#include +#include class QByteArray; class QIODevice; diff --git a/lang/qt/src/encryptjob.h b/lang/qt/src/encryptjob.h index 1fd28905..6c4ae5c2 100644 --- a/lang/qt/src/encryptjob.h +++ b/lang/qt/src/encryptjob.h @@ -36,8 +36,7 @@ #include "job.h" -#include - +#include #include class QByteArray; diff --git a/lang/qt/src/qgpgmeadduseridjob.cpp b/lang/qt/src/qgpgmeadduseridjob.cpp index 2155675e..b1d5c5c0 100644 --- a/lang/qt/src/qgpgmeadduseridjob.cpp +++ b/lang/qt/src/qgpgmeadduseridjob.cpp @@ -45,7 +45,6 @@ using namespace QGpgME; using namespace GpgME; -using namespace boost; QGpgMEAddUserIDJob::QGpgMEAddUserIDJob(Context *context) : mixin_type(context) @@ -77,7 +76,7 @@ static QGpgMEAddUserIDJob::result_type add_user_id(Context *ctx, const Key &key, Error QGpgMEAddUserIDJob::start(const Key &key, const QString &name, const QString &email, const QString &comment) { - run(bind(&add_user_id, _1, key, name, email, comment)); + run(std::bind(&add_user_id, std::placeholders::_1, key, name, email, comment)); return Error(); } #include "qgpgmeadduseridjob.moc" diff --git a/lang/qt/src/qgpgmechangeexpiryjob.cpp b/lang/qt/src/qgpgmechangeexpiryjob.cpp index d0a93d82..81a49fd1 100644 --- a/lang/qt/src/qgpgmechangeexpiryjob.cpp +++ b/lang/qt/src/qgpgmechangeexpiryjob.cpp @@ -48,7 +48,6 @@ using namespace QGpgME; using namespace GpgME; -using namespace boost; QGpgMEChangeExpiryJob::QGpgMEChangeExpiryJob(Context *context) : mixin_type(context) @@ -76,7 +75,7 @@ static QGpgMEChangeExpiryJob::result_type change_expiry(Context *ctx, const Key Error QGpgMEChangeExpiryJob::start(const Key &key, const QDateTime &expiry) { - run(bind(&change_expiry, _1, key, expiry)); + run(std::bind(&change_expiry, std::placeholders::_1, key, expiry)); return Error(); } #include "qgpgmechangeexpiryjob.moc" diff --git a/lang/qt/src/qgpgmechangeownertrustjob.cpp b/lang/qt/src/qgpgmechangeownertrustjob.cpp index 8d9f00f6..c3220ee1 100644 --- a/lang/qt/src/qgpgmechangeownertrustjob.cpp +++ b/lang/qt/src/qgpgmechangeownertrustjob.cpp @@ -45,7 +45,6 @@ using namespace QGpgME; using namespace GpgME; -using namespace boost; QGpgMEChangeOwnerTrustJob::QGpgMEChangeOwnerTrustJob(Context *context) : mixin_type(context) @@ -72,7 +71,7 @@ static QGpgMEChangeOwnerTrustJob::result_type change_ownertrust(Context *ctx, co Error QGpgMEChangeOwnerTrustJob::start(const Key &key, Key::OwnerTrust trust) { - run(bind(&change_ownertrust, _1, key, trust)); + run(std::bind(&change_ownertrust, std::placeholders::_1, key, trust)); return Error(); } #include "qgpgmechangeownertrustjob.moc" diff --git a/lang/qt/src/qgpgmechangepasswdjob.cpp b/lang/qt/src/qgpgmechangepasswdjob.cpp index eb9937fa..618ed1d5 100644 --- a/lang/qt/src/qgpgmechangepasswdjob.cpp +++ b/lang/qt/src/qgpgmechangepasswdjob.cpp @@ -44,7 +44,6 @@ using namespace QGpgME; using namespace GpgME; -using namespace boost; QGpgMEChangePasswdJob::QGpgMEChangePasswdJob(Context *context) : mixin_type(context) @@ -73,7 +72,7 @@ static QGpgMEChangePasswdJob::result_type change_passwd(Context *ctx, const Key Error QGpgMEChangePasswdJob::start(const Key &key) { - run(bind(&change_passwd, _1, key)); + run(std::bind(&change_passwd, std::placeholders::_1, key)); return Error(); } diff --git a/lang/qt/src/qgpgmedecryptjob.cpp b/lang/qt/src/qgpgmedecryptjob.cpp index 4c2319c0..8233f8d9 100644 --- a/lang/qt/src/qgpgmedecryptjob.cpp +++ b/lang/qt/src/qgpgmedecryptjob.cpp @@ -100,13 +100,13 @@ static QGpgMEDecryptJob::result_type decrypt_qba(Context *ctx, const QByteArray Error QGpgMEDecryptJob::start(const QByteArray &cipherText) { - run(bind(&decrypt_qba, _1, cipherText)); + run(std::bind(&decrypt_qba, std::placeholders::_1, cipherText)); return Error(); } void QGpgMEDecryptJob::start(const std::shared_ptr &cipherText, const std::shared_ptr &plainText) { - run(bind(&decrypt, _1, _2, _3, _4), cipherText, plainText); + run(std::bind(&decrypt, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4), cipherText, plainText); } GpgME::DecryptionResult QGpgME::QGpgMEDecryptJob::exec(const QByteArray &cipherText, diff --git a/lang/qt/src/qgpgmedecryptverifyjob.cpp b/lang/qt/src/qgpgmedecryptverifyjob.cpp index 8c7ef972..8f9026d7 100644 --- a/lang/qt/src/qgpgmedecryptverifyjob.cpp +++ b/lang/qt/src/qgpgmedecryptverifyjob.cpp @@ -108,13 +108,13 @@ static QGpgMEDecryptVerifyJob::result_type decrypt_verify_qba(Context *ctx, cons Error QGpgMEDecryptVerifyJob::start(const QByteArray &cipherText) { - run(bind(&decrypt_verify_qba, _1, cipherText)); + run(std::bind(&decrypt_verify_qba, std::placeholders::_1, cipherText)); return Error(); } void QGpgMEDecryptVerifyJob::start(const std::shared_ptr &cipherText, const std::shared_ptr &plainText) { - run(bind(&decrypt_verify, _1, _2, _3, _4), cipherText, plainText); + run(std::bind(&decrypt_verify, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4), cipherText, plainText); } std::pair diff --git a/lang/qt/src/qgpgmedeletejob.cpp b/lang/qt/src/qgpgmedeletejob.cpp index 4b2f83a3..4de3a172 100644 --- a/lang/qt/src/qgpgmedeletejob.cpp +++ b/lang/qt/src/qgpgmedeletejob.cpp @@ -40,7 +40,6 @@ using namespace QGpgME; using namespace GpgME; -using namespace boost; QGpgMEDeleteJob::QGpgMEDeleteJob(Context *context) : mixin_type(context) @@ -60,7 +59,7 @@ static QGpgMEDeleteJob::result_type delete_key(Context *ctx, const Key &key, boo Error QGpgMEDeleteJob::start(const Key &key, bool allowSecretKeyDeletion) { - run(bind(&delete_key, _1, key, allowSecretKeyDeletion)); + run(std::bind(&delete_key, std::placeholders::_1, key, allowSecretKeyDeletion)); return Error(); } #include "qgpgmedeletejob.moc" diff --git a/lang/qt/src/qgpgmedownloadjob.cpp b/lang/qt/src/qgpgmedownloadjob.cpp index 4f9eea2b..59cf378e 100644 --- a/lang/qt/src/qgpgmedownloadjob.cpp +++ b/lang/qt/src/qgpgmedownloadjob.cpp @@ -88,13 +88,13 @@ static QGpgMEDownloadJob::result_type download(Context *ctx, QThread *thread, co Error QGpgMEDownloadJob::start(const QStringList &pats) { - run(bind(&download_qsl, _1, pats)); + run(std::bind(&download_qsl, std::placeholders::_1, pats)); return Error(); } Error QGpgMEDownloadJob::start(const QByteArray &fpr, const std::shared_ptr &keyData) { - run(bind(&download, _1, _2, fpr, _3), keyData); + run(std::bind(&download, std::placeholders::_1, std::placeholders::_2, fpr, std::placeholders::_3), keyData); return Error(); } #include "qgpgmedownloadjob.moc" diff --git a/lang/qt/src/qgpgmeencryptjob.cpp b/lang/qt/src/qgpgmeencryptjob.cpp index df8ae7d2..eb4bd449 100644 --- a/lang/qt/src/qgpgmeencryptjob.cpp +++ b/lang/qt/src/qgpgmeencryptjob.cpp @@ -41,13 +41,11 @@ #include -#include #include using namespace QGpgME; using namespace GpgME; -using namespace boost; QGpgMEEncryptJob::QGpgMEEncryptJob(Context *context) : mixin_type(context), @@ -123,16 +121,16 @@ static QGpgMEEncryptJob::result_type encrypt_qba(Context *ctx, const std::vector Error QGpgMEEncryptJob::start(const std::vector &recipients, const QByteArray &plainText, bool alwaysTrust) { - run(boost::bind(&encrypt_qba, _1, recipients, plainText, alwaysTrust, mOutputIsBase64Encoded)); + run(std::bind(&encrypt_qba, std::placeholders::_1, recipients, plainText, alwaysTrust, mOutputIsBase64Encoded)); return Error(); } void QGpgMEEncryptJob::start(const std::vector &recipients, const std::shared_ptr &plainText, const std::shared_ptr &cipherText, bool alwaysTrust) { - run(boost::bind(&encrypt, - _1, _2, + run(std::bind(&encrypt, + std::placeholders::_1, std::placeholders::_2, recipients, - _3, _4, + std::placeholders::_3, std::placeholders::_4, alwaysTrust, mOutputIsBase64Encoded), plainText, cipherText); @@ -141,14 +139,14 @@ void QGpgMEEncryptJob::start(const std::vector &recipients, const std::shar EncryptionResult QGpgMEEncryptJob::exec(const std::vector &recipients, const QByteArray &plainText, bool alwaysTrust, QByteArray &cipherText) { const result_type r = encrypt_qba(context(), recipients, plainText, alwaysTrust, mOutputIsBase64Encoded); - cipherText = get<1>(r); + cipherText = std::get<1>(r); resultHook(r); return mResult; } void QGpgMEEncryptJob::resultHook(const result_type &tuple) { - mResult = get<0>(tuple); + mResult = std::get<0>(tuple); } #if 0 diff --git a/lang/qt/src/qgpgmeexportjob.cpp b/lang/qt/src/qgpgmeexportjob.cpp index 56584faf..dec9817e 100644 --- a/lang/qt/src/qgpgmeexportjob.cpp +++ b/lang/qt/src/qgpgmeexportjob.cpp @@ -45,7 +45,6 @@ using namespace QGpgME; using namespace GpgME; -using namespace boost; QGpgMEExportJob::QGpgMEExportJob(Context *context) : mixin_type(context) @@ -71,7 +70,7 @@ static QGpgMEExportJob::result_type export_qba(Context *ctx, const QStringList & Error QGpgMEExportJob::start(const QStringList &patterns) { - run(bind(&export_qba, _1, patterns)); + run(std::bind(&export_qba, std::placeholders::_1, patterns)); return Error(); } #include "qgpgmeexportjob.moc" diff --git a/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp b/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp index a223aacf..2753b0b3 100644 --- a/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp +++ b/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp @@ -43,7 +43,6 @@ using namespace QGpgME; using namespace GpgME; -using namespace boost; QGpgMEImportFromKeyserverJob::QGpgMEImportFromKeyserverJob(Context *context) : mixin_type(context) @@ -63,7 +62,7 @@ static QGpgMEImportFromKeyserverJob::result_type importfromkeyserver(Context *ct Error QGpgMEImportFromKeyserverJob::start(const std::vector &keys) { - run(boost::bind(&importfromkeyserver, _1, keys)); + run(std::bind(&importfromkeyserver, std::placeholders::_1, keys)); return Error(); } @@ -78,6 +77,6 @@ GpgME::ImportResult QGpgME::QGpgMEImportFromKeyserverJob::exec(const std::vector void QGpgME::QGpgMEImportFromKeyserverJob::resultHook(const result_type &tuple) { - mResult = get<0>(tuple); + mResult = std::get<0>(tuple); } #include "qgpgmeimportfromkeyserverjob.moc" diff --git a/lang/qt/src/qgpgmeimportjob.cpp b/lang/qt/src/qgpgmeimportjob.cpp index f76fc7d3..891c0f6c 100644 --- a/lang/qt/src/qgpgmeimportjob.cpp +++ b/lang/qt/src/qgpgmeimportjob.cpp @@ -43,7 +43,6 @@ using namespace QGpgME; using namespace GpgME; -using namespace boost; QGpgMEImportJob::QGpgMEImportJob(Context *context) : mixin_type(context) @@ -66,7 +65,7 @@ static QGpgMEImportJob::result_type import_qba(Context *ctx, const QByteArray &c Error QGpgMEImportJob::start(const QByteArray &certData) { - run(bind(&import_qba, _1, certData)); + run(std::bind(&import_qba, std::placeholders::_1, certData)); return Error(); } @@ -81,6 +80,6 @@ GpgME::ImportResult QGpgME::QGpgMEImportJob::exec(const QByteArray &keyData) void QGpgME::QGpgMEImportJob::resultHook(const result_type &tuple) { - mResult = get<0>(tuple); + mResult = std::get<0>(tuple); } #include "qgpgmeimportjob.moc" diff --git a/lang/qt/src/qgpgmekeygenerationjob.cpp b/lang/qt/src/qgpgmekeygenerationjob.cpp index ad2904e2..d286ed59 100644 --- a/lang/qt/src/qgpgmekeygenerationjob.cpp +++ b/lang/qt/src/qgpgmekeygenerationjob.cpp @@ -42,7 +42,6 @@ using namespace QGpgME; using namespace GpgME; -using namespace boost; QGpgMEKeyGenerationJob::QGpgMEKeyGenerationJob(Context *context) : mixin_type(context) @@ -66,7 +65,7 @@ static QGpgMEKeyGenerationJob::result_type generate_key(Context *ctx, const QStr Error QGpgMEKeyGenerationJob::start(const QString ¶meters) { - run(bind(&generate_key, _1, parameters)); + run(std::bind(&generate_key, std::placeholders::_1, parameters)); return Error(); } #include "qgpgmekeygenerationjob.moc" diff --git a/lang/qt/src/qgpgmekeylistjob.cpp b/lang/qt/src/qgpgmekeylistjob.cpp index 61da5be5..a9cc5e18 100644 --- a/lang/qt/src/qgpgmekeylistjob.cpp +++ b/lang/qt/src/qgpgmekeylistjob.cpp @@ -48,7 +48,6 @@ using namespace QGpgME; using namespace GpgME; -using namespace boost; QGpgMEKeyListJob::QGpgMEKeyListJob(Context *context) : mixin_type(context), @@ -132,7 +131,7 @@ retry: Error QGpgMEKeyListJob::start(const QStringList &patterns, bool secretOnly) { mSecretOnly = secretOnly; - run(boost::bind(&list_keys, _1, patterns, secretOnly)); + run(std::bind(&list_keys, std::placeholders::_1, patterns, secretOnly)); return Error(); } @@ -141,14 +140,14 @@ KeyListResult QGpgMEKeyListJob::exec(const QStringList &patterns, bool secretOnl mSecretOnly = secretOnly; const result_type r = list_keys(context(), patterns, secretOnly); resultHook(r); - keys = get<1>(r); - return get<0>(r); + keys = std::get<1>(r); + return std::get<0>(r); } void QGpgMEKeyListJob::resultHook(const result_type &tuple) { - mResult = get<0>(tuple); - Q_FOREACH (const Key &key, get<1>(tuple)) { + mResult = std::get<0>(tuple); + Q_FOREACH (const Key &key, std::get<1>(tuple)) { Q_EMIT nextKey(key); } } diff --git a/lang/qt/src/qgpgmenewcryptoconfig.cpp b/lang/qt/src/qgpgmenewcryptoconfig.cpp index a187360f..965069cd 100644 --- a/lang/qt/src/qgpgmenewcryptoconfig.cpp +++ b/lang/qt/src/qgpgmenewcryptoconfig.cpp @@ -41,15 +41,11 @@ #include "global.h" #include "error.h" -#include -#include -#include #include #include #include -using namespace boost; using namespace QGpgME; using namespace GpgME; using namespace GpgME::Configuration; @@ -108,7 +104,7 @@ void QGpgMENewCryptoConfig::reloadConfiguration(bool showErrors) KMessageBox::error(0, wmsg); } #endif - BOOST_FOREACH(const Component & c, components) { + Q_FOREACH(const Component & c, components) { const std::shared_ptr comp(new QGpgMENewCryptoConfigComponent); comp->setComponent(c); m_componentsByName[ comp->name() ] = comp; @@ -138,7 +134,7 @@ QGpgMENewCryptoConfigComponent *QGpgMENewCryptoConfig::component(const QString & void QGpgMENewCryptoConfig::sync(bool runtime) { - BOOST_FOREACH(const std::shared_ptr &c, m_componentsByName) + Q_FOREACH(const std::shared_ptr &c, m_componentsByName) c->sync(runtime); } @@ -167,7 +163,7 @@ void QGpgMENewCryptoConfigComponent::setComponent(const Component &component) std::shared_ptr group; const std::vector