kvp-frame.hpp: expose the iterator from underlying std::map (?)

Gnucash · Apr 8, 2022 · ce9cfca · ce9cfca
1 parent 9117615
commit ce9cfca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/bindings/guile/gnc-kvp-guile.cpp b/bindings/guile/gnc-kvp-guile.cpp
@@ -129,15 +129,14 @@ gnc_kvp_value_ptr_to_scm(KvpValue* val)
     break;
     case KvpValue::Type::FRAME:
     {
-        auto rv = SCM_EOL;
-        auto acc = [](const auto& k, const auto& v, auto& rv)
+        auto frame { val->get<KvpFrame*>() };
+        auto acc = [](const auto& rv, const auto& iter)
         {
-            auto key_scm { scm_from_utf8_string (k) };
-            auto val_scm { gnc_kvp_value_ptr_to_scm (v) };
-            rv = scm_acons (key_scm, val_scm, rv);
+            auto key_scm { scm_from_utf8_string (iter.first) };
+            auto val_scm { gnc_kvp_value_ptr_to_scm (iter.second) };
+            return scm_acons (key_scm, val_scm, rv);
         };
-        val->get<KvpFrame*>()->for_each_slot_temp (acc, rv);
-        return scm_reverse (rv);
+        return scm_reverse (std::accumulate (frame->begin(), frame->end(), SCM_EOL, acc));
     }
     break;
     case KvpValue::Type::GLIST:

diff --git a/libgnucash/engine/kvp-frame.hpp b/libgnucash/engine/kvp-frame.hpp
@@ -226,6 +226,9 @@ struct KvpFrameImpl
     bool empty() const noexcept { return m_valuemap.empty(); }
     friend int compare(const KvpFrameImpl&, const KvpFrameImpl&) noexcept;
 
+    map_type::iterator begin() { return m_valuemap.begin(); }
+    map_type::iterator end() { return m_valuemap.end(); }
+
     private:
     map_type m_valuemap;