[libcamera-devel] libcamera: device_enumerator_udev: Align class final declaration with sysfs subclass

Message ID 20200802225023.346784-1-niklas.soderlund@ragnatech.se
State Accepted
Commit f0f297c5f26d2e87b9ce819973beac47f361c7ee
Headers show
Series
  • [libcamera-devel] libcamera: device_enumerator_udev: Align class final declaration with sysfs subclass
Related show

Commit Message

Niklas Söderlund Aug. 2, 2020, 10:50 p.m. UTC
Instead of marking each individual overloaded function with final mark
the whole class as final. This aligns the sysfs and udev based
DeviceEnumerator implementations.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
 include/libcamera/internal/device_enumerator_udev.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Laurent Pinchart Aug. 2, 2020, 10:53 p.m. UTC | #1
Hi Niklas,

Thank you for the patch.

On Mon, Aug 03, 2020 at 12:50:23AM +0200, Niklas Söderlund wrote:
> Instead of marking each individual overloaded function with final mark
> the whole class as final. This aligns the sysfs and udev based
> DeviceEnumerator implementations.
> 
> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  include/libcamera/internal/device_enumerator_udev.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/include/libcamera/internal/device_enumerator_udev.h b/include/libcamera/internal/device_enumerator_udev.h
> index 2e7916a0b280f60d..6f45be0c1c423d02 100644
> --- a/include/libcamera/internal/device_enumerator_udev.h
> +++ b/include/libcamera/internal/device_enumerator_udev.h
> @@ -26,14 +26,14 @@ class EventNotifier;
>  class MediaDevice;
>  class MediaEntity;
>  
> -class DeviceEnumeratorUdev : public DeviceEnumerator
> +class DeviceEnumeratorUdev final : public DeviceEnumerator
>  {
>  public:
>  	DeviceEnumeratorUdev();
>  	~DeviceEnumeratorUdev();
>  
> -	int init() final;
> -	int enumerate() final;
> +	int init();
> +	int enumerate();
>  
>  private:
>  	using DependencyMap = std::map<dev_t, std::list<MediaEntity *>>;
Umang Jain Aug. 3, 2020, 4:23 a.m. UTC | #2
Hi Niklas,

On 8/3/20 4:20 AM, Niklas Söderlund wrote:
> Instead of marking each individual overloaded function with final mark
> the whole class as final. This aligns the sysfs and udev based
> DeviceEnumerator implementations.
>
> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Umang Jain <email@uajain.com>

Thanks.

> ---
>   include/libcamera/internal/device_enumerator_udev.h | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/include/libcamera/internal/device_enumerator_udev.h b/include/libcamera/internal/device_enumerator_udev.h
> index 2e7916a0b280f60d..6f45be0c1c423d02 100644
> --- a/include/libcamera/internal/device_enumerator_udev.h
> +++ b/include/libcamera/internal/device_enumerator_udev.h
> @@ -26,14 +26,14 @@ class EventNotifier;
>   class MediaDevice;
>   class MediaEntity;
>   
> -class DeviceEnumeratorUdev : public DeviceEnumerator
> +class DeviceEnumeratorUdev final : public DeviceEnumerator
>   {
>   public:
>   	DeviceEnumeratorUdev();
>   	~DeviceEnumeratorUdev();
>   
> -	int init() final;
> -	int enumerate() final;
> +	int init();
> +	int enumerate();
>   
>   private:
>   	using DependencyMap = std::map<dev_t, std::list<MediaEntity *>>;

Patch

diff --git a/include/libcamera/internal/device_enumerator_udev.h b/include/libcamera/internal/device_enumerator_udev.h
index 2e7916a0b280f60d..6f45be0c1c423d02 100644
--- a/include/libcamera/internal/device_enumerator_udev.h
+++ b/include/libcamera/internal/device_enumerator_udev.h
@@ -26,14 +26,14 @@  class EventNotifier;
 class MediaDevice;
 class MediaEntity;
 
-class DeviceEnumeratorUdev : public DeviceEnumerator
+class DeviceEnumeratorUdev final : public DeviceEnumerator
 {
 public:
 	DeviceEnumeratorUdev();
 	~DeviceEnumeratorUdev();
 
-	int init() final;
-	int enumerate() final;
+	int init();
+	int enumerate();
 
 private:
 	using DependencyMap = std::map<dev_t, std::list<MediaEntity *>>;