summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Mantia <amantia@kde.org>2016-11-02 10:58:40 (GMT)
committerAndras Mantia <amantia@kde.org>2016-11-02 10:58:40 (GMT)
commit8973c75c9427d2fe53227303a081951ecea39b9a (patch)
treea06becd2e2309b28ec3989a7041f7acb93d5fe83
parente69f0b08cb8d907df868159e2d90341de5330406 (diff)
Fix build with g++ 4.8.x
-rw-r--r--src/models/keycache.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/models/keycache.cpp b/src/models/keycache.cpp
index 153eac4..c9473d1 100644
--- a/src/models/keycache.cpp
+++ b/src/models/keycache.cpp
@@ -262,7 +262,7 @@ void KeyCache::reload(GpgME::Protocol /*proto*/)
enableFileSystemWatcher(false);
d->m_refreshJob = new RefreshKeysJob(this);
- connect(d->m_refreshJob, &RefreshKeysJob::done,
+ connect(d->m_refreshJob.data(), &RefreshKeysJob::done,
this, [this](const GpgME::KeyListResult &r) {
d->refreshJobDone(r);
});
@@ -708,7 +708,7 @@ void KeyCache::remove(const Key &key)
Q_EMIT aboutToRemove(key);
{
- const auto range = std::equal_range(d->by.fpr.cbegin(), d->by.fpr.cend(), fpr,
+ const auto range = std::equal_range(d->by.fpr.begin(), d->by.fpr.end(), fpr,
_detail::ByFingerprint<std::less>());
d->by.fpr.erase(range.first, range.second);
}
@@ -734,7 +734,7 @@ void KeyCache::remove(const Key &key)
}
if (const char *chainid = key.chainID()) {
- const auto range = std::equal_range(d->by.chainid.cbegin(), d->by.chainid.cend(), chainid,
+ const auto range = std::equal_range(d->by.chainid.begin(), d->by.chainid.end(), chainid,
_detail::ByChainID<std::less>());
const auto range2 = std::equal_range(range.first, range.second, fpr, _detail::ByFingerprint<std::less>());
d->by.chainid.erase(range2.first, range2.second);
@@ -751,7 +751,7 @@ void KeyCache::remove(const Key &key)
Q_FOREACH (const Subkey &subkey, key.subkeys()) {
if (const char *keyid = subkey.keyID()) {
- const auto range = std::equal_range(d->by.subkeyid.cbegin(), d->by.subkeyid.cend(), keyid,
+ const auto range = std::equal_range(d->by.subkeyid.begin(), d->by.subkeyid.end(), keyid,
_detail::ByKeyID<std::less>());
const auto range2 = std::equal_range(range.first, range.second, fpr, _detail::ByKeyID<std::less>());
d->by.subkeyid.erase(range2.first, range2.second);