From 1fca6228fece89c9270ff1abb293fdf48f1b577b Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Sun, 18 Apr 2021 16:42:17 +0200 Subject: libcamera: Drop argument from LIBCAMERA_DECLARE_PRIVATE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The LIBCAMERA_DECLARE_PRIVATE() macro, used by the library classes that inherit from libcamera::Extensible in order to implement the PIMPL pattern, expands to: public: \ class Private; \ friend class Private; The 'klass' argument is not used and it might confuse developers as it might hint that the class that defines the pattern's implementation can be freely named, while it is actually hardcoded to 'Private'. Drop the argument from the macro definition. Reviewed-by: Laurent Pinchart Reviewed-by: Niklas Söderlund Reviewed-by: Hanlin Chen Signed-off-by: Jacopo Mondi --- include/libcamera/camera.h | 2 +- include/libcamera/camera_manager.h | 2 +- include/libcamera/class.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h index 326b14d0..d7164180 100644 --- a/include/libcamera/camera.h +++ b/include/libcamera/camera.h @@ -74,7 +74,7 @@ protected: class Camera final : public Object, public std::enable_shared_from_this, public Extensible { - LIBCAMERA_DECLARE_PRIVATE(Camera) + LIBCAMERA_DECLARE_PRIVATE() public: static std::shared_ptr create(PipelineHandler *pipe, diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h index 35a59f0d..c2f0b786 100644 --- a/include/libcamera/camera_manager.h +++ b/include/libcamera/camera_manager.h @@ -22,7 +22,7 @@ class Camera; class CameraManager : public Object, public Extensible { - LIBCAMERA_DECLARE_PRIVATE(CameraManager) + LIBCAMERA_DECLARE_PRIVATE() public: CameraManager(); ~CameraManager(); diff --git a/include/libcamera/class.h b/include/libcamera/class.h index 920624d8..466114ec 100644 --- a/include/libcamera/class.h +++ b/include/libcamera/class.h @@ -30,7 +30,7 @@ namespace libcamera { #endif #ifndef __DOXYGEN__ -#define LIBCAMERA_DECLARE_PRIVATE(klass) \ +#define LIBCAMERA_DECLARE_PRIVATE() \ public: \ class Private; \ friend class Private; @@ -46,7 +46,7 @@ public: \ _o(); #else -#define LIBCAMERA_DECLARE_PRIVATE(klass) +#define LIBCAMERA_DECLARE_PRIVATE() #define LIBCAMERA_DECLARE_PUBLIC(klass) #define LIBCAMERA_D_PTR(klass) #define LIBCAMERA_O_PTR(klass) -- cgit v1.2.1