From 5d6a5fe73837e0d3f66d20b1e575940806d1f1ed Mon Sep 17 00:00:00 2001
From: Michal Badecki <michal.badecki@digitalstrom.com>
Date: Fri, 30 Mar 2018 12:18:19 +0200
Subject: [PATCH] PersistentStorage - rename PairType to PersistentRecord, make
it public
---
persistentstorage.hpp | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/persistentstorage.hpp b/persistentstorage.hpp
index 7dca4d9..96dc25e 100644
--- a/persistentstorage.hpp
+++ b/persistentstorage.hpp
@@ -12,10 +12,10 @@
namespace p44 {
-namespace detail {
-
template <typename T>
-using PairType = std::pair<const char*, T&>;
+using PersistentRecord = std::pair<const char*, T&>;
+
+namespace detail {
class Field
@@ -117,24 +117,24 @@ class PersistentStorage : public BaseClass
size_t numAllFields() { return fieldDefs.size(); }
- void add(detail::PairType<std::string> aField, size_t aIndex)
+ void add(PersistentRecord<std::string> aField, size_t aIndex)
{
fieldDefs[aIndex] = std::make_unique<detail::StringField>(aField.first, aField.second);
}
- void add(detail::PairType<bool> aField, size_t aIndex)
+ void add(PersistentRecord<bool> aField, size_t aIndex)
{
fieldDefs[aIndex] = std::make_unique<detail::BoolField>(aField.first, aField.second);
}
- void add(detail::PairType<std::list<std::string>> aField, size_t aIndex)
+ void add(PersistentRecord<std::list<std::string>> aField, size_t aIndex)
{
fieldDefs[aIndex] = std::make_unique<detail::StringListField>(aField.first, aField.second);
}
public:
template <typename ...BaseArgs>
- PersistentStorage(detail::PairType<Args>... aArgs, BaseArgs&&... aBaseArgs) :
+ PersistentStorage(PersistentRecord<Args>... aArgs, BaseArgs&&... aBaseArgs) :
inherited(std::forward<BaseArgs>(aBaseArgs)...)
{
size_t index = 0;
@@ -197,9 +197,9 @@ class PersistentStorageWithTableName : public PersistentStorage<BaseClass, Args.
public:
template <typename ...BaseArgs>
- PersistentStorageWithTableName(const std::string& aTableName, detail::PairType<Args>&&... aArgs, BaseArgs&&... aBaseArgs) :
+ PersistentStorageWithTableName(const std::string& aTableName, PersistentRecord<Args>&&... aArgs, BaseArgs&&... aBaseArgs) :
name(aTableName),
- inherited(std::forward<detail::PairType<Args>>(aArgs)..., std::forward<BaseArgs>(aBaseArgs)...) {}
+ inherited(std::forward<PersistentRecord<Args>>(aArgs)..., std::forward<BaseArgs>(aBaseArgs)...) {}
const char *tableName() P44_OVERRIDE { return name.c_str(); };
@@ -215,9 +215,9 @@ class PersistentStorageWithRowId : public PersistentStorageWithTableName<BaseCla
public:
template <typename ...BaseArgs>
- PersistentStorageWithRowId(const string& aRowId, const std::string& aTableName, detail::PairType<Args>&&... aArgs, BaseArgs&&... aBaseArgs) :
+ PersistentStorageWithRowId(const string& aRowId, const std::string& aTableName, PersistentRecord<Args>&&... aArgs, BaseArgs&&... aBaseArgs) :
rowId(aRowId),
- inherited(aTableName, std::forward<detail::PairType<Args>>(aArgs)..., std::forward<BaseArgs>(aBaseArgs)...) {}
+ inherited(aTableName, std::forward<PersistentRecord<Args>>(aArgs)..., std::forward<BaseArgs>(aBaseArgs)...) {}
void load()
{
--
GitLab