diff options
| author | Andre Heinecke <[email protected]> | 2016-04-11 15:15:16 +0000 | 
|---|---|---|
| committer | Andre Heinecke <[email protected]> | 2016-04-11 15:15:16 +0000 | 
| commit | afd8fad6e275e2f74b2ad045dce05d826986e2ec (patch) | |
| tree | 624b6e9097a2c4c3e06ab9e25b5f4efcfafbf96f /lang/qt/src/qgpgmeencryptjob.cpp | |
| parent | Qt: Remove predicates.h and stl_util.h (diff) | |
| download | gpgme-afd8fad6e275e2f74b2ad045dce05d826986e2ec.tar.gz gpgme-afd8fad6e275e2f74b2ad045dce05d826986e2ec.zip | |
Qt: Remove remaining boost usage
* lang/qt/src/dataprovider.h,
 lang/qt/src/decryptjob.h,
 lang/qt/src/decryptverifyjob.h,
 lang/qt/src/encryptjob.h,
 lang/qt/src/qgpgmeadduseridjob.cpp,
 lang/qt/src/qgpgmechangeexpiryjob.cpp,
 lang/qt/src/qgpgmechangeownertrustjob.cpp,
 lang/qt/src/qgpgmechangepasswdjob.cpp,
 lang/qt/src/qgpgmedecryptjob.cpp,
 lang/qt/src/qgpgmedecryptverifyjob.cpp,
 lang/qt/src/qgpgmedeletejob.cpp,
 lang/qt/src/qgpgmedownloadjob.cpp,
 lang/qt/src/qgpgmeencryptjob.cpp,
 lang/qt/src/qgpgmeexportjob.cpp,
 lang/qt/src/qgpgmeimportfromkeyserverjob.cpp,
 lang/qt/src/qgpgmeimportjob.cpp,
 lang/qt/src/qgpgmekeygenerationjob.cpp,
 lang/qt/src/qgpgmekeylistjob.cpp,
 lang/qt/src/qgpgmenewcryptoconfig.cpp,
 lang/qt/src/qgpgmenewcryptoconfig.h,
 lang/qt/src/qgpgmesignencryptjob.cpp,
 lang/qt/src/qgpgmesignjob.cpp,
 lang/qt/src/qgpgmesignkeyjob.cpp,
 lang/qt/src/qgpgmeverifydetachedjob.cpp,
 lang/qt/src/qgpgmeverifyopaquejob.cpp,
 lang/qt/src/signencryptjob.h,
 lang/qt/src/signjob.h,
 lang/qt/src/threadedjobmixin.cpp,
 lang/qt/src/threadedjobmixin.h,
 lang/qt/src/verifydetachedjob.h,
 lang/qt/src/verifyopaquejob.h: Remove boost usage.
--
Mostly done with search and replace.
Diffstat (limited to 'lang/qt/src/qgpgmeencryptjob.cpp')
| -rw-r--r-- | lang/qt/src/qgpgmeencryptjob.cpp | 14 | 
1 files changed, 6 insertions, 8 deletions
| 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 <QBuffer> -#include <boost/weak_ptr.hpp>  #include <cassert>  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<Key> &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<Key> &recipients, const std::shared_ptr<QIODevice> &plainText, const std::shared_ptr<QIODevice> &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<Key> &recipients, const std::shar  EncryptionResult QGpgMEEncryptJob::exec(const std::vector<Key> &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 | 
