[libcamera-devel,1/8] libcamera: Correct struct forward declarations

Message ID 20190426150155.18652-2-laurent.pinchart@ideasonboard.com
State Accepted
Commit 152147c539d8e0e920547167c462c54d744601f7
Headers show
Series
  • Fix clang compilation warnings and errors
Related show

Commit Message

Laurent Pinchart April 26, 2019, 3:01 p.m. UTC
Several structures are forward-declarated as classes. Fix this by using
the struct keyword where appropriate, or removing the forward
declaration when not needed.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 include/libcamera/camera.h               | 3 ++-
 src/libcamera/include/camera_sensor.h    | 3 ++-
 src/libcamera/include/pipeline_handler.h | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

Comments

Kieran Bingham April 26, 2019, 4:03 p.m. UTC | #1
Hi Laurent,

On 26/04/2019 17:01, Laurent Pinchart wrote:
> Several structures are forward-declarated as classes. Fix this by using
> the struct keyword where appropriate, or removing the forward
> declaration when not needed.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

This looks good to me.

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> ---
>  include/libcamera/camera.h               | 3 ++-
>  src/libcamera/include/camera_sensor.h    | 3 ++-
>  src/libcamera/include/pipeline_handler.h | 1 -
>  3 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h
> index b2dafda342fe..777b7e4d48b8 100644
> --- a/include/libcamera/camera.h
> +++ b/include/libcamera/camera.h
> @@ -21,9 +21,10 @@ class Buffer;
>  class PipelineHandler;
>  class Request;
>  class Stream;
> -class StreamConfiguration;
>  class StreamUsage;
>  
> +struct StreamConfiguration;
> +
>  class CameraConfiguration
>  {
>  public:
> diff --git a/src/libcamera/include/camera_sensor.h b/src/libcamera/include/camera_sensor.h
> index 7f2f906be8df..b823480241a7 100644
> --- a/src/libcamera/include/camera_sensor.h
> +++ b/src/libcamera/include/camera_sensor.h
> @@ -18,7 +18,8 @@ namespace libcamera {
>  
>  class MediaEntity;
>  class V4L2Subdevice;
> -class V4L2SubdeviceFormat;
> +
> +struct V4L2SubdeviceFormat;
>  
>  class CameraSensor : protected Loggable
>  {
> diff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h
> index c3f7d4c29205..5830e53108fa 100644
> --- a/src/libcamera/include/pipeline_handler.h
> +++ b/src/libcamera/include/pipeline_handler.h
> @@ -26,7 +26,6 @@ class MediaDevice;
>  class PipelineHandler;
>  class Request;
>  class Stream;
> -class StreamConfiguration;
>  class StreamUsage;
>  
>  class CameraData
>

Patch

diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h
index b2dafda342fe..777b7e4d48b8 100644
--- a/include/libcamera/camera.h
+++ b/include/libcamera/camera.h
@@ -21,9 +21,10 @@  class Buffer;
 class PipelineHandler;
 class Request;
 class Stream;
-class StreamConfiguration;
 class StreamUsage;
 
+struct StreamConfiguration;
+
 class CameraConfiguration
 {
 public:
diff --git a/src/libcamera/include/camera_sensor.h b/src/libcamera/include/camera_sensor.h
index 7f2f906be8df..b823480241a7 100644
--- a/src/libcamera/include/camera_sensor.h
+++ b/src/libcamera/include/camera_sensor.h
@@ -18,7 +18,8 @@  namespace libcamera {
 
 class MediaEntity;
 class V4L2Subdevice;
-class V4L2SubdeviceFormat;
+
+struct V4L2SubdeviceFormat;
 
 class CameraSensor : protected Loggable
 {
diff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h
index c3f7d4c29205..5830e53108fa 100644
--- a/src/libcamera/include/pipeline_handler.h
+++ b/src/libcamera/include/pipeline_handler.h
@@ -26,7 +26,6 @@  class MediaDevice;
 class PipelineHandler;
 class Request;
 class Stream;
-class StreamConfiguration;
 class StreamUsage;
 
 class CameraData