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/qgpgmenewcryptoconfig.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/qgpgmenewcryptoconfig.cpp')
-rw-r--r-- | lang/qt/src/qgpgmenewcryptoconfig.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lang/qt/src/qgpgmenewcryptoconfig.cpp b/lang/qt/src/qgpgmenewcryptoconfig.cpp index 13017d6a..a187360f 100644 --- a/lang/qt/src/qgpgmenewcryptoconfig.cpp +++ b/lang/qt/src/qgpgmenewcryptoconfig.cpp @@ -109,7 +109,7 @@ void QGpgMENewCryptoConfig::reloadConfiguration(bool showErrors) } #endif BOOST_FOREACH(const Component & c, components) { - const shared_ptr<QGpgMENewCryptoConfigComponent> comp(new QGpgMENewCryptoConfigComponent); + const std::shared_ptr<QGpgMENewCryptoConfigComponent> comp(new QGpgMENewCryptoConfigComponent); comp->setComponent(c); m_componentsByName[ comp->name() ] = comp; } @@ -138,7 +138,7 @@ QGpgMENewCryptoConfigComponent *QGpgMENewCryptoConfig::component(const QString & void QGpgMENewCryptoConfig::sync(bool runtime) { - BOOST_FOREACH(const shared_ptr<QGpgMENewCryptoConfigComponent> &c, m_componentsByName) + BOOST_FOREACH(const std::shared_ptr<QGpgMENewCryptoConfigComponent> &c, m_componentsByName) c->sync(runtime); } @@ -164,7 +164,7 @@ void QGpgMENewCryptoConfigComponent::setComponent(const Component &component) m_component = component; m_groupsByName.clear(); - shared_ptr<QGpgMENewCryptoConfigGroup> group; + std::shared_ptr<QGpgMENewCryptoConfigGroup> group; const std::vector<Option> options = m_component.options(); BOOST_FOREACH(const Option & o, options) @@ -174,7 +174,7 @@ void QGpgMENewCryptoConfigComponent::setComponent(const Component &component) } group.reset(new QGpgMENewCryptoConfigGroup(shared_from_this(), o)); } else if (group) { - const shared_ptr<QGpgMENewCryptoConfigEntry> entry(new QGpgMENewCryptoConfigEntry(group, o)); + const std::shared_ptr<QGpgMENewCryptoConfigEntry> entry(new QGpgMENewCryptoConfigEntry(group, o)); const QString name = entry->name(); group->m_entryNames.push_back(name); group->m_entriesByName[name] = entry; @@ -231,7 +231,7 @@ void QGpgMENewCryptoConfigComponent::sync(bool runtime) //// -QGpgMENewCryptoConfigGroup::QGpgMENewCryptoConfigGroup(const shared_ptr<QGpgMENewCryptoConfigComponent> &comp, const Option &option) +QGpgMENewCryptoConfigGroup::QGpgMENewCryptoConfigGroup(const std::shared_ptr<QGpgMENewCryptoConfigComponent> &comp, const Option &option) : CryptoConfigGroup(), m_component(comp), m_option(option) @@ -252,7 +252,7 @@ QString QGpgMENewCryptoConfigGroup::description() const QString QGpgMENewCryptoConfigGroup::path() const { - if (const shared_ptr<QGpgMENewCryptoConfigComponent> c = m_component.lock()) { + if (const std::shared_ptr<QGpgMENewCryptoConfigComponent> c = m_component.lock()) { return c->name() + QLatin1Char('/') + name(); } else { return QString(); @@ -312,7 +312,7 @@ static QGpgME::CryptoConfigEntry::ArgType knownArgType(int argType, bool &ok) } } -QGpgMENewCryptoConfigEntry::QGpgMENewCryptoConfigEntry(const shared_ptr<QGpgMENewCryptoConfigGroup> &group, const Option &option) +QGpgMENewCryptoConfigEntry::QGpgMENewCryptoConfigEntry(const std::shared_ptr<QGpgMENewCryptoConfigGroup> &group, const Option &option) : m_group(group), m_option(option) { } @@ -387,7 +387,7 @@ QString QGpgMENewCryptoConfigEntry::description() const QString QGpgMENewCryptoConfigEntry::path() const { - if (const shared_ptr<QGpgMENewCryptoConfigGroup> g = m_group.lock()) { + if (const std::shared_ptr<QGpgMENewCryptoConfigGroup> g = m_group.lock()) { return g->path() + QLatin1Char('/') + name(); } else { return QString(); |