From d32dc0c1c85325926d20044141d5b9850b9433fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>
Date: Wed, 23 Jan 2019 12:27:52 +0100
Subject: libcamera: fix odd include file hierarchy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.

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 | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp
index 37ccbd53..4ea7ed44 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 f05f201f..b03217d5 100644
--- a/src/libcamera/include/pipeline_handler.h
+++ b/src/libcamera/include/pipeline_handler.h
@@ -11,8 +11,6 @@
 #include <string>
 #include <vector>
 
-#include <libcamera/camera.h>
-
 namespace libcamera {
 
 class CameraManager;
-- 
cgit v1.2.1