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>

3 files changed, 22 insertions, 22 deletions

diff --git a/test/controls/control_info.cpp b/test/controls/control_info_map.cpp
index fa9d7bae..eeb702db 100644
--- a/test/controls/control_info.cpp
+++ b/test/controls/control_info_map.cpp
@@ -36,41 +36,41 @@ protected:
 
 	int run() override
 	{
-		const ControlInfoMap &info = camera_->controls();
+		const ControlInfoMap &infoMap = camera_->controls();
 
 		/* Test looking up a valid control by ControlId. */
-		if (info.count(&controls::Brightness) != 1) {
+		if (infoMap.count(&controls::Brightness) != 1) {
 			cerr << "count() on valid control failed" << endl;
 			return TestFail;
 		}
 
-		if (info.find(&controls::Brightness) == info.end()) {
+		if (infoMap.find(&controls::Brightness) == infoMap.end()) {
 			cerr << "find() on valid control failed" << endl;
 			return TestFail;
 		}
 
-		info.at(&controls::Brightness);
+		infoMap.at(&controls::Brightness);
 
 		/* Test looking up a valid control by numerical ID. */
-		if (info.count(controls::Brightness.id()) != 1) {
+		if (infoMap.count(controls::Brightness.id()) != 1) {
 			cerr << "count() on valid ID failed" << endl;
 			return TestFail;
 		}
 
-		if (info.find(controls::Brightness.id()) == info.end()) {
+		if (infoMap.find(controls::Brightness.id()) == infoMap.end()) {
 			cerr << "find() on valid ID failed" << endl;
 			return TestFail;
 		}
 
-		info.at(controls::Brightness.id());
+		infoMap.at(controls::Brightness.id());
 
 		/* Test looking up an invalid control by numerical ID. */
-		if (info.count(12345) != 0) {
+		if (infoMap.count(12345) != 0) {
 			cerr << "count() on invalid ID failed" << endl;
 			return TestFail;
 		}
 
-		if (info.find(12345) != info.end()) {
+		if (infoMap.find(12345) != infoMap.end()) {
 			cerr << "find() on invalid ID failed" << endl;
 			return TestFail;
 		}
diff --git a/test/controls/meson.build b/test/controls/meson.build
index f0850df2..16a7f33f 100644
--- a/test/controls/meson.build
+++ b/test/controls/meson.build
@@ -1,8 +1,8 @@
 control_tests = [
-    [ 'control_info',   'control_info.cpp' ],
-    [ 'control_list',   'control_list.cpp' ],
-    [ 'control_range',  'control_range.cpp' ],
-    [ 'control_value',  'control_value.cpp' ],
+    [ 'control_info_map',           'control_info_map.cpp' ],
+    [ 'control_list',               'control_list.cpp' ],
+    [ 'control_range',              'control_range.cpp' ],
+    [ 'control_value',              'control_value.cpp' ],
 ]
 
 foreach t : control_tests
diff --git a/test/v4l2_videodevice/controls.cpp b/test/v4l2_videodevice/controls.cpp
index 42c653d4..1b71bf06 100644
--- a/test/v4l2_videodevice/controls.cpp
+++ b/test/v4l2_videodevice/controls.cpp
@@ -26,27 +26,27 @@ public:
 protected:
 	int run()
 	{
-		const ControlInfoMap &info = capture_->controls();
+		const ControlInfoMap &infoMap = capture_->controls();
 
 		/* Test control enumeration. */
-		if (info.empty()) {
+		if (infoMap.empty()) {
 			cerr << "Failed to enumerate controls" << endl;
 			return TestFail;
 		}
 
-		if (info.find(V4L2_CID_BRIGHTNESS) == info.end() ||
-		    info.find(V4L2_CID_CONTRAST) == info.end() ||
-		    info.find(V4L2_CID_SATURATION) == info.end()) {
+		if (infoMap.find(V4L2_CID_BRIGHTNESS) == infoMap.end() ||
+		    infoMap.find(V4L2_CID_CONTRAST) == infoMap.end() ||
+		    infoMap.find(V4L2_CID_SATURATION) == infoMap.end()) {
 			cerr << "Missing controls" << endl;
 			return TestFail;
 		}
 
-		const ControlRange &brightness = info.find(V4L2_CID_BRIGHTNESS)->second;
-		const ControlRange &contrast = info.find(V4L2_CID_CONTRAST)->second;
-		const ControlRange &saturation = info.find(V4L2_CID_SATURATION)->second;
+		const ControlRange &brightness = infoMap.find(V4L2_CID_BRIGHTNESS)->second;
+		const ControlRange &contrast = infoMap.find(V4L2_CID_CONTRAST)->second;
+		const ControlRange &saturation = infoMap.find(V4L2_CID_SATURATION)->second;
 
 		/* Test getting controls. */
-		ControlList ctrls(info);
+		ControlList ctrls(infoMap);
 		ctrls.set(V4L2_CID_BRIGHTNESS, -1);
 		ctrls.set(V4L2_CID_CONTRAST, -1);
 		ctrls.set(V4L2_CID_SATURATION, -1);