From 549d982f61fd3820aa3d14c21406f5ce360a5b90 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Mon, 21 Sep 2020 04:06:34 +0300
Subject: libcamera: camera_manager: Inherit from Extensible
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use the d-pointer infrastructure offered by the Extensible class to
replace the custom implementation.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
 include/libcamera/camera_manager.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h
index 9eb2b6f5..6d5341c7 100644
--- a/include/libcamera/camera_manager.h
+++ b/include/libcamera/camera_manager.h
@@ -12,6 +12,7 @@
 #include <sys/types.h>
 #include <vector>
 
+#include <libcamera/extensible.h>
 #include <libcamera/object.h>
 #include <libcamera/signal.h>
 
@@ -20,8 +21,9 @@ namespace libcamera {
 class Camera;
 class EventDispatcher;
 
-class CameraManager : public Object
+class CameraManager : public Object, public Extensible
 {
+	LIBCAMERA_DECLARE_PRIVATE(CameraManager)
 public:
 	CameraManager();
 	CameraManager(const CameraManager &) = delete;
@@ -50,9 +52,6 @@ public:
 private:
 	static const std::string version_;
 	static CameraManager *self_;
-
-	class Private;
-	std::unique_ptr<Private> p_;
 };
 
 } /* namespace libcamera */
-- 
cgit v1.2.1