libcamera: Global s/devnode/deviceNode rename

Do not use the abreviated version for members, variables and getter
methods.

Library-wise rename, no intended functional changes.

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>

4 files changed, 11 insertions, 11 deletions

diff --git a/src/libcamera/include/device_enumerator.h b/src/libcamera/include/device_enumerator.h
index c5541c5f..40c7750b 100644
--- a/src/libcamera/include/device_enumerator.h
+++ b/src/libcamera/include/device_enumerator.h
@@ -45,12 +45,12 @@ public:
 	MediaDevice *search(const DeviceMatch &dm);
 
 protected:
-	int addDevice(const std::string &devnode);
+	int addDevice(const std::string &deviceNode);
 
 private:
 	std::vector<MediaDevice *> devices_;
 
-	virtual std::string lookupDevnode(int major, int minor) = 0;
+	virtual std::string lookupDeviceNode(int major, int minor) = 0;
 };
 
 class DeviceEnumeratorUdev: public DeviceEnumerator
@@ -65,7 +65,7 @@ public:
 private:
 	struct udev *udev_;
 
-	std::string lookupDevnode(int major, int minor) final;
+	std::string lookupDeviceNode(int major, int minor) final;
 };
 
 } /* namespace libcamera */
diff --git a/src/libcamera/include/media_device.h b/src/libcamera/include/media_device.h
index a8dec0d3..ba3046dd 100644
--- a/src/libcamera/include/media_device.h
+++ b/src/libcamera/include/media_device.h
@@ -21,7 +21,7 @@ namespace libcamera {
 class MediaDevice
 {
 public:
-	MediaDevice(const std::string &devnode);
+	MediaDevice(const std::string &deviceNode);
 	~MediaDevice();
 
 	bool acquire();
@@ -35,7 +35,7 @@ public:
 	bool valid() const { return valid_; }
 
 	const std::string driver() const { return driver_; }
-	const std::string devnode() const { return devnode_; }
+	const std::string deviceNode() const { return deviceNode_; }
 
 	const std::vector<MediaEntity *> &entities() const { return entities_; }
 	MediaEntity *getEntityByName(const std::string &name) const;
@@ -49,7 +49,7 @@ public:
 
 private:
 	std::string driver_;
-	std::string devnode_;
+	std::string deviceNode_;
 	int fd_;
 	bool valid_;
 	bool acquired_;
diff --git a/src/libcamera/include/media_object.h b/src/libcamera/include/media_object.h
index fad55a06..64095bec 100644
--- a/src/libcamera/include/media_object.h
+++ b/src/libcamera/include/media_object.h
@@ -85,7 +85,7 @@ class MediaEntity : public MediaObject
 public:
 	const std::string &name() const { return name_; }
 	unsigned int function() const { return function_; }
-	const std::string &devnode() const { return devnode_; }
+	const std::string &deviceNode() const { return deviceNode_; }
 	unsigned int deviceMajor() const { return major_; }
 	unsigned int deviceMinor() const { return minor_; }
 
@@ -94,7 +94,7 @@ public:
 	const MediaPad *getPadByIndex(unsigned int index) const;
 	const MediaPad *getPadById(unsigned int id) const;
 
-	int setDeviceNode(const std::string &devnode);
+	int setDeviceNode(const std::string &deviceNode);
 
 private:
 	friend class MediaDevice;
@@ -106,7 +106,7 @@ private:
 
 	std::string name_;
 	unsigned int function_;
-	std::string devnode_;
+	std::string deviceNode_;
 	unsigned int major_;
 	unsigned int minor_;
 
diff --git a/src/libcamera/include/v4l2_device.h b/src/libcamera/include/v4l2_device.h
index c6f3d9a0..b92e1f1c 100644
--- a/src/libcamera/include/v4l2_device.h
+++ b/src/libcamera/include/v4l2_device.h
@@ -36,7 +36,7 @@ class MediaEntity;
 class V4L2Device
 {
 public:
-	explicit V4L2Device(const std::string &devnode);
+	explicit V4L2Device(const std::string &deviceNode);
 	explicit V4L2Device(const MediaEntity &entity);
 	V4L2Device(const V4L2Device &) = delete;
 	~V4L2Device();
@@ -52,7 +52,7 @@ public:
 	const char *busName() const { return caps_.bus_info(); }
 
 private:
-	std::string devnode_;
+	std::string deviceNode_;
 	int fd_;
 	V4L2Capability caps_;
 };