summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2022-05-25 01:58:12 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2022-06-20 15:12:26 +0300
commit9dacead6156f6083f7e0a148f228a7e1ebb4d5a3 (patch)
tree521e146636c9c37dc1212aa513becea1d511459b
parent12bf40414776e4acb1b1b2d2a1c429a564a7d504 (diff)
libcamera: yaml_parser: Remove memberNames() function
Now that YamlObject supports iteration, the memberNames() function isn't useful anymore as it can be implemented using utils::map_keys() if really needed. Drop it. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Han-Lin Chen <hanlinchen@chromium.org>
-rw-r--r--include/libcamera/internal/yaml_parser.h1
-rw-r--r--src/libcamera/yaml_parser.cpp22
-rw-r--r--test/yaml-parser.cpp10
3 files changed, 0 insertions, 33 deletions
diff --git a/include/libcamera/internal/yaml_parser.h b/include/libcamera/internal/yaml_parser.h
index d681ba11..7e44723b 100644
--- a/include/libcamera/internal/yaml_parser.h
+++ b/include/libcamera/internal/yaml_parser.h
@@ -172,7 +172,6 @@ public:
bool contains(const std::string &key) const;
const YamlObject &operator[](const std::string &key) const;
- std::vector<std::string> memberNames() const;
private:
LIBCAMERA_DISABLE_COPY_AND_MOVE(YamlObject)
diff --git a/src/libcamera/yaml_parser.cpp b/src/libcamera/yaml_parser.cpp
index 4df7e5a3..9b6e70cb 100644
--- a/src/libcamera/yaml_parser.cpp
+++ b/src/libcamera/yaml_parser.cpp
@@ -336,28 +336,6 @@ bool YamlObject::contains(const std::string &key) const
}
/**
- * \fn YamlObject::memberNames()
- * \brief Retrieve all member names of the dictionary
- *
- * This function retrieve member names of a YamlObject. Only YamlObject
- * instances of Dictionary type associate elements with names, calling this
- * function on other types of instances is invalid and results in undefined
- * behaviour.
- *
- * \todo Replace this function with an iterator-based API
- *
- * \return A vector of string as the member names
- */
-std::vector<std::string> YamlObject::memberNames() const
-{
- std::vector<std::string> memberNames;
- for (auto &[key, _] : dictionary_)
- memberNames.push_back(key);
-
- return memberNames;
-}
-
-/**
* \fn YamlObject::operator[](const std::string &key) const
* \brief Retrieve a member by name from the dictionary
*
diff --git a/test/yaml-parser.cpp b/test/yaml-parser.cpp
index ab6e9a01..38f84823 100644
--- a/test/yaml-parser.cpp
+++ b/test/yaml-parser.cpp
@@ -500,16 +500,6 @@ protected:
/* Make sure utils::map_keys() works on the adapter. */
(void)utils::map_keys(dictObj.asDict());
- auto memeberNames = dictObj.memberNames();
- sort(memeberNames.begin(), memeberNames.end());
-
- if (memeberNames[0] != "a" ||
- memeberNames[1] != "b" ||
- memeberNames[2] != "c") {
- cerr << "Dictionary object fail to parse member names" << std::endl;
- return TestFail;
- }
-
/* Test leveled objects */
auto &level1Obj = (*root)["level1"];