summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-03-01 22:02:37 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-03-20 16:47:45 +0200
commit73b7ba9da5fe7b1aec62af091ad36403cd3505c4 (patch)
treebae0d37032c303da9f142d398d585ddc539e38cc /include
parentcf66c4406bbd66b885090d2ddbe2b72b6fb0492d (diff)
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 <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'include')
-rw-r--r--include/libcamera/controls.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h
index 0e111ab7..3d2250f4 100644
--- a/include/libcamera/controls.h
+++ b/include/libcamera/controls.h
@@ -313,7 +313,7 @@ private:
public:
ControlList();
ControlList(const ControlIdMap &idmap, ControlValidator *validator = nullptr);
- ControlList(const ControlInfoMap &info, ControlValidator *validator = nullptr);
+ ControlList(const ControlInfoMap &infoMap, ControlValidator *validator = nullptr);
using iterator = ControlListMap::iterator;
using const_iterator = ControlListMap::const_iterator;