diff options
author | Andre Heinecke <[email protected]> | 2016-04-03 12:52:16 +0000 |
---|---|---|
committer | Andre Heinecke <[email protected]> | 2016-04-03 12:52:16 +0000 |
commit | f98898ab1a6952e0c3a5d235963a27eba2e19e46 (patch) | |
tree | 2adfdba73a049780a21d47220b052dad5ce391b5 /lang/qt/src/qgpgmekeylistjob.cpp | |
parent | Cpp: Require c++ 11 if cpp binding requested (diff) | |
download | gpgme-f98898ab1a6952e0c3a5d235963a27eba2e19e46.tar.gz gpgme-f98898ab1a6952e0c3a5d235963a27eba2e19e46.zip |
Cpp / Qt: Reduce boost usage (memory and tuple)
* cpp/src/assuanresult.h,
cpp/src/configuration.cpp,
cpp/src/configuration.h,
cpp/src/data.h,
cpp/src/decryptionresult.h,
cpp/src/defaultassuantransaction.cpp,
cpp/src/encryptionresult.cpp,
cpp/src/encryptionresult.h,
cpp/src/engineinfo.h,
cpp/src/gpgagentgetinfoassuantransaction.cpp,
cpp/src/gpgsignkeyeditinteractor.cpp,
cpp/src/importresult.cpp,
cpp/src/importresult.h,
cpp/src/key.h,
cpp/src/keygenerationresult.h,
cpp/src/keylistresult.h,
cpp/src/notation.h,
cpp/src/signingresult.cpp,
cpp/src/signingresult.h,
cpp/src/verificationresult.cpp,
cpp/src/verificationresult.h,
cpp/src/vfsmountresult.h,
qt/src/dataprovider.cpp,
qt/src/dataprovider.h,
qt/src/decryptjob.h,
qt/src/decryptverifyjob.h,
qt/src/downloadjob.h,
qt/src/encryptjob.h,
qt/src/qgpgmeadduseridjob.cpp,
qt/src/qgpgmechangeexpiryjob.cpp,
qt/src/qgpgmechangeownertrustjob.cpp,
qt/src/qgpgmechangepasswdjob.cpp,
qt/src/qgpgmedecryptjob.cpp,
qt/src/qgpgmedecryptjob.h,
qt/src/qgpgmedecryptverifyjob.cpp,
qt/src/qgpgmedecryptverifyjob.h,
qt/src/qgpgmedeletejob.cpp,
qt/src/qgpgmedownloadjob.cpp,
qt/src/qgpgmedownloadjob.h,
qt/src/qgpgmeencryptjob.cpp,
qt/src/qgpgmeencryptjob.h,
qt/src/qgpgmeexportjob.cpp,
qt/src/qgpgmeexportjob.h,
qt/src/qgpgmeimportfromkeyserverjob.cpp,
qt/src/qgpgmeimportfromkeyserverjob.h,
qt/src/qgpgmeimportjob.cpp,
qt/src/qgpgmeimportjob.h,
qt/src/qgpgmekeygenerationjob.cpp,
qt/src/qgpgmekeygenerationjob.h,
qt/src/qgpgmekeylistjob.cpp,
qt/src/qgpgmekeylistjob.h,
qt/src/qgpgmelistallkeysjob.cpp,
qt/src/qgpgmelistallkeysjob.h,
qt/src/qgpgmenewcryptoconfig.cpp,
qt/src/qgpgmenewcryptoconfig.h,
qt/src/qgpgmesignencryptjob.cpp,
qt/src/qgpgmesignencryptjob.h,
qt/src/qgpgmesignjob.cpp,
qt/src/qgpgmesignjob.h,
qt/src/qgpgmesignkeyjob.cpp,
qt/src/qgpgmeverifydetachedjob.cpp,
qt/src/qgpgmeverifydetachedjob.h,
qt/src/qgpgmeverifyopaquejob.cpp,
qt/src/qgpgmeverifyopaquejob.h,
qt/src/signencryptjob.h,
qt/src/signjob.h,
qt/src/threadedjobmixin.h,
qt/src/verifydetachedjob.h,
qt/src/verifyopaquejob.h: Reduce boost usage.
--
This was mostly done with search and replace to change the
templates / classes from memory and tuple to their c++11
equivalents.
Diffstat (limited to 'lang/qt/src/qgpgmekeylistjob.cpp')
-rw-r--r-- | lang/qt/src/qgpgmekeylistjob.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lang/qt/src/qgpgmekeylistjob.cpp b/lang/qt/src/qgpgmekeylistjob.cpp index 2af45fe7..61da5be5 100644 --- a/lang/qt/src/qgpgmekeylistjob.cpp +++ b/lang/qt/src/qgpgmekeylistjob.cpp @@ -85,7 +85,7 @@ static QGpgMEKeyListJob::result_type list_keys(Context *ctx, QStringList pats, b if (pats.size() < 2) { std::vector<Key> keys; const KeyListResult r = do_list_keys(ctx, pats, keys, secretOnly); - return boost::make_tuple(r, keys, QString(), Error()); + return std::make_tuple(r, keys, QString(), Error()); } // The communication channel between gpgme and gpgsm is limited in @@ -110,14 +110,14 @@ retry: if (chunkSize < 1) // chunks smaller than one can't be -> return the error. { - return boost::make_tuple(this_result, keys, QString(), Error()); + return std::make_tuple(this_result, keys, QString(), Error()); } else { goto retry; } } else if (this_result.error().code() == GPG_ERR_EOF) { // early end of keylisting (can happen when ~/.gnupg doesn't // exist). Fakeing an empty result: - return boost::make_tuple(KeyListResult(), std::vector<Key>(), QString(), Error()); + return std::make_tuple(KeyListResult(), std::vector<Key>(), QString(), Error()); } // ok, that seemed to work... result.mergeWith(this_result); @@ -126,7 +126,7 @@ retry: } pats = pats.mid(chunkSize); } while (!pats.empty()); - return boost::make_tuple(result, keys, QString(), Error()); + return std::make_tuple(result, keys, QString(), Error()); } Error QGpgMEKeyListJob::start(const QStringList &patterns, bool secretOnly) |