[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [libkleo] src/models: Fix build with g++ 4.8.x
From:       Andras Mantia <amantia () kde ! org>
Date:       2016-11-02 10:58:47
Message-ID: E1c1tFn-0002uI-8K () code ! kde ! org
[Download RAW message or body]

Git commit 8973c75c9427d2fe53227303a081951ecea39b9a by Andras Mantia.
Committed on 02/11/2016 at 10:58.
Pushed by amantia into branch 'master'.

Fix build with g++ 4.8.x

M  +4    -4    src/models/keycache.cpp

http://commits.kde.org/libkleo/8973c75c9427d2fe53227303a081951ecea39b9a

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);


[prev in list] [next in list] [prev in thread] [next in thread]