From patchwork Wed Jan 23 11:29:57 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?=
 <niklas.soderlund@ragnatech.se>
X-Patchwork-Id: 349
Return-Path: <niklas.soderlund@ragnatech.se>
Received: from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net
	[195.74.38.227])
	by lancelot.ideasonboard.com (Postfix) with ESMTPS id F376560C7D
	for <libcamera-devel@lists.libcamera.org>;
	Wed, 23 Jan 2019 12:30:07 +0100 (CET)
X-Halon-ID: 2a987948-1f02-11e9-911a-0050569116f7
Authorized-sender: niklas@soderlund.pp.se
Received: from bismarck.berto.se (unknown [89.233.230.99])
	by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA
	id 2a987948-1f02-11e9-911a-0050569116f7;
	Wed, 23 Jan 2019 12:29:42 +0100 (CET)
From: =?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>
To: libcamera-devel@lists.libcamera.org
Date: Wed, 23 Jan 2019 12:29:57 +0100
Message-Id: <20190123112957.25580-1-niklas.soderlund@ragnatech.se>
X-Mailer: git-send-email 2.20.1
MIME-Version: 1.0
Subject: [libcamera-devel] [PATCH] libcamera: fix odd include file hierarchy
X-BeenThere: libcamera-devel@lists.libcamera.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: <libcamera-devel.lists.libcamera.org>
List-Unsubscribe: <https://lists.libcamera.org/options/libcamera-devel>,
	<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>
List-Archive: <https://lists.libcamera.org/pipermail/libcamera-devel/>
List-Post: <mailto:libcamera-devel@lists.libcamera.org>
List-Help: <mailto:libcamera-devel-request@lists.libcamera.org?subject=help>
List-Subscribe: <https://lists.libcamera.org/listinfo/libcamera-devel>,
	<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Jan 2019 11:30:08 -0000

There is no need for pipeline_handler.h to include camera.h, instead it
should be included in the source file which needs it;
camera_manager.cpp. Fix this by adding a forward declaration of Camera
in pipeline_handler.h and include the header in the correct file.

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

diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp
index 37ccbd533790856a..4ea7ed44cc31f747 100644
--- a/src/libcamera/camera_manager.cpp
+++ b/src/libcamera/camera_manager.cpp
@@ -5,6 +5,7 @@
  * camera_manager.h - Camera management
  */
 
+#include <libcamera/camera.h>
 #include <libcamera/camera_manager.h>
 #include <libcamera/event_dispatcher.h>
 
diff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h
index f05f201f7ca824eb..87dc3debd795eb3e 100644
--- a/src/libcamera/include/pipeline_handler.h
+++ b/src/libcamera/include/pipeline_handler.h
@@ -11,10 +11,9 @@
 #include <string>
 #include <vector>
 
-#include <libcamera/camera.h>
-
 namespace libcamera {
 
+class Camera;
 class CameraManager;
 class DeviceEnumerator;