From 73b7ba9da5fe7b1aec62af091ad36403cd3505c4 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sun, 1 Mar 2020 22:02:37 +0200 Subject: libcamera: controls: Name all ControlInfoMap instance variables infoMap To prepare for the rename of ControlRange to ControlInfo, rename all the ControlInfoMap instance variables currently named info to infoMap. This will help avoiding namespace clashes. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- src/libcamera/controls.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libcamera/controls.cpp') diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp index 4326174a..833a436c 100644 --- a/src/libcamera/controls.cpp +++ b/src/libcamera/controls.cpp @@ -706,11 +706,11 @@ ControlList::ControlList(const ControlIdMap &idmap, ControlValidator *validator) /** * \brief Construct a ControlList with the idmap of a control info map - * \param[in] info The ControlInfoMap for the control list target object + * \param[in] infoMap The ControlInfoMap for the control list target object * \param[in] validator The validator (may be null) */ -ControlList::ControlList(const ControlInfoMap &info, ControlValidator *validator) - : validator_(validator), idmap_(&info.idmap()), infoMap_(&info) +ControlList::ControlList(const ControlInfoMap &infoMap, ControlValidator *validator) + : validator_(validator), idmap_(&infoMap.idmap()), infoMap_(&infoMap) { } -- cgit v1.2.1