PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: yaml_parser: Rename Container to ValueContainer

Browse Source 
The YamlObject class defines two private types, Container and
ListContainer. The format is an alias to std::vector<Value>, and is used
to store child elements. The latter hasn't been used since commit
38987e165c ("libcamera: yaml_parser: Preserve order of items in
dictionary").

To prepare for upcoming reworks that will use the name 'Container' as a
template parameter, rename Container to ValueContainer for clarity, and
drop the unused ListContainer type.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Isaac Scott <isaac.scott@ideasonboard.com>
This commit is contained in:
Laurent Pinchart
2025-10-15 17:14:47 +03:00
parent 01f5db9559
commit c6aace4467
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/libcamera/internal/yaml_parser.h
View File

@@ -36,8 +36,7 @@ private:
std::unique_ptr<YamlObject> value;
};
using Container = std::vector<Value>;
using ListContainer = std::vector<std::unique_ptr<YamlObject>>;
using ValueContainer = std::vector<Value>;
public:
#ifndef __DOXYGEN__
@@ -48,7 +47,7 @@ public:
using difference_type = std::ptrdiff_t;
using iterator_category = std::forward_iterator_tag;
Iterator(typename Container::const_iterator it)
Iterator(typename ValueContainer::const_iterator it)
: it_(it)
{
}
@@ -77,14 +76,14 @@ public:
}
protected:
Container::const_iterator it_;
ValueContainer::const_iterator it_;
};
template<typename Iterator>
class Adapter
{
public:
Adapter(const Container &container)
Adapter(const ValueContainer &container)
: container_(container)
{
}
@@ -100,7 +99,7 @@ public:
}
protected:
const Container &container_;
const ValueContainer &container_;
};
class ListIterator : public Iterator<ListIterator>
@@ -232,7 +231,7 @@ private:
Type type_;
std::string value_;
Container list_;
ValueContainer list_;
std::map<std::string, YamlObject *, std::less<>> dictionary_;
};