From 4d22621ec11a065b1819f6268335cae81dd50986 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 20 Jul 2022 00:27:37 +0300 Subject: libcamera: controls: Drop ControlList::contains() The ControlList::contains(const ControlId &id) function isn't used, as it has been replaced by usage of the get() function. Document get as being the preferred way to check for the presence of a control in a ControlList, and drop the contains() function. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Reviewed-by: Umang Jain --- src/libcamera/controls.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp index 39c29488..bc3db4f6 100644 --- a/src/libcamera/controls.cpp +++ b/src/libcamera/controls.cpp @@ -931,17 +931,6 @@ void ControlList::merge(const ControlList &source) } } -/** - * \brief Check if the list contains a control with the specified \a id - * \param[in] id The control ID - * - * \return True if the list contains a matching control, false otherwise - */ -bool ControlList::contains(const ControlId &id) const -{ - return controls_.find(id.id()) != controls_.end(); -} - /** * \brief Check if the list contains a control with the specified \a id * \param[in] id The control numerical ID @@ -958,6 +947,10 @@ bool ControlList::contains(unsigned int id) const * \brief Get the value of control \a ctrl * \param[in] ctrl The control * + * Beside getting the value of a control, this function can also be used to + * check if a control is present in the ControlList by converting the returned + * std::optional to bool (or calling its has_value() function). + * * \return A std::optional containing the control value, or std::nullopt if * the control \a ctrl is not present in the list */ -- cgit v1.2.1