aboutsummaryrefslogtreecommitdiffstats
path: root/lang/qt/src/qgpgmenewcryptoconfig.h
diff options
context:
space:
mode:
authorAndre Heinecke <[email protected]>2016-04-03 12:52:16 +0000
committerAndre Heinecke <[email protected]>2016-04-03 12:52:16 +0000
commitf98898ab1a6952e0c3a5d235963a27eba2e19e46 (patch)
tree2adfdba73a049780a21d47220b052dad5ce391b5 /lang/qt/src/qgpgmenewcryptoconfig.h
parentCpp: Require c++ 11 if cpp binding requested (diff)
downloadgpgme-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.h')
-rw-r--r--lang/qt/src/qgpgmenewcryptoconfig.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/lang/qt/src/qgpgmenewcryptoconfig.h b/lang/qt/src/qgpgmenewcryptoconfig.h
index 0afe3811..be184ac9 100644
--- a/lang/qt/src/qgpgmenewcryptoconfig.h
+++ b/lang/qt/src/qgpgmenewcryptoconfig.h
@@ -62,7 +62,7 @@ class QGpgMENewCryptoConfigEntry;
class QGpgMENewCryptoConfigEntry : public QGpgME::CryptoConfigEntry
{
public:
- QGpgMENewCryptoConfigEntry(const boost::shared_ptr<QGpgMENewCryptoConfigGroup> &group, const GpgME::Configuration::Option &option);
+ QGpgMENewCryptoConfigEntry(const std::shared_ptr<QGpgMENewCryptoConfigGroup> &group, const GpgME::Configuration::Option &option);
~QGpgMENewCryptoConfigEntry();
QString name() const Q_DECL_OVERRIDE;
@@ -106,14 +106,14 @@ protected:
QString toString(bool escape) const;
#endif
private:
- boost::weak_ptr<QGpgMENewCryptoConfigGroup> m_group;
+ std::weak_ptr<QGpgMENewCryptoConfigGroup> m_group;
GpgME::Configuration::Option m_option;
};
class QGpgMENewCryptoConfigGroup : public QGpgME::CryptoConfigGroup
{
public:
- QGpgMENewCryptoConfigGroup(const boost::shared_ptr<QGpgMENewCryptoConfigComponent> &parent, const GpgME::Configuration::Option &option);
+ QGpgMENewCryptoConfigGroup(const std::shared_ptr<QGpgMENewCryptoConfigComponent> &parent, const GpgME::Configuration::Option &option);
~QGpgMENewCryptoConfigGroup();
QString name() const Q_DECL_OVERRIDE;
@@ -129,14 +129,14 @@ public:
private:
friend class QGpgMENewCryptoConfigComponent; // it adds the entries
- boost::weak_ptr<QGpgMENewCryptoConfigComponent> m_component;
+ std::weak_ptr<QGpgMENewCryptoConfigComponent> m_component;
GpgME::Configuration::Option m_option;
QStringList m_entryNames;
- QHash< QString, boost::shared_ptr<QGpgMENewCryptoConfigEntry> > m_entriesByName;
+ QHash< QString, std::shared_ptr<QGpgMENewCryptoConfigEntry> > m_entriesByName;
};
/// For docu, see kleo/cryptoconfig.h
-class QGpgMENewCryptoConfigComponent : public QGpgME::CryptoConfigComponent, public boost::enable_shared_from_this<QGpgMENewCryptoConfigComponent>
+class QGpgMENewCryptoConfigComponent : public QGpgME::CryptoConfigComponent, public std::enable_shared_from_this<QGpgMENewCryptoConfigComponent>
{
public:
QGpgMENewCryptoConfigComponent();
@@ -157,7 +157,7 @@ public:
private:
GpgME::Configuration::Component m_component;
- QHash< QString, boost::shared_ptr<QGpgMENewCryptoConfigGroup> > m_groupsByName;
+ QHash< QString, std::shared_ptr<QGpgMENewCryptoConfigGroup> > m_groupsByName;
};
/**
@@ -185,7 +185,7 @@ private:
void reloadConfiguration(bool showErrors);
private:
- QHash< QString, boost::shared_ptr<QGpgMENewCryptoConfigComponent> > m_componentsByName;
+ QHash< QString, std::shared_ptr<QGpgMENewCryptoConfigComponent> > m_componentsByName;
bool m_parsed;
};