libcamera: Fix header grouping

20872 diff mbox series

The libcamera coding style groups the C and C++ standard library headers
in a single group. Fix the few offenders in the source tree.

While at it, add a missing blank line between header groups in a
separate location.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 include/libcamera/base/file.h         | 5 ++---
 include/libcamera/ipa/ipa_interface.h | 3 +--
 src/gstreamer/gstlibcamerapool.cpp    | 1 +
 src/ipa/libipa/camera_sensor_helper.h | 3 +--
 4 files changed, 5 insertions(+), 7 deletions(-)


base-commit: 62760bd2605a83e663b9003244ff42f8946f8955

Laurent Pinchart <laurent.pinchart@ideasonboard.com> writes:

> The libcamera coding style groups the C and C++ standard library headers
> in a single group. Fix the few offenders in the source tree.
>
> While at it, add a missing blank line between header groups in a
> separate location.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Milan Zamazal <mzamazal@redhat.com>

> ---
>  include/libcamera/base/file.h         | 5 ++---
>  include/libcamera/ipa/ipa_interface.h | 3 +--
>  src/gstreamer/gstlibcamerapool.cpp    | 1 +
>  src/ipa/libipa/camera_sensor_helper.h | 3 +--
>  4 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/include/libcamera/base/file.h b/include/libcamera/base/file.h
> index 192668abeff1..6d3f106d5900 100644
> --- a/include/libcamera/base/file.h
> +++ b/include/libcamera/base/file.h
> @@ -7,11 +7,10 @@
>  
>  #pragma once
>  
> -#include <stdint.h>
> -#include <sys/types.h>
> -
>  #include <map>
> +#include <stdint.h>
>  #include <string>
> +#include <sys/types.h>
>  
>  #include <libcamera/base/private.h>
>  
> diff --git a/include/libcamera/ipa/ipa_interface.h b/include/libcamera/ipa/ipa_interface.h
> index 53cf5377fcc6..7c835e984442 100644
> --- a/include/libcamera/ipa/ipa_interface.h
> +++ b/include/libcamera/ipa/ipa_interface.h
> @@ -7,10 +7,9 @@
>  
>  #pragma once
>  
> +#include <map>
>  #include <stddef.h>
>  #include <stdint.h>
> -
> -#include <map>
>  #include <vector>
>  
>  #include <libcamera/base/flags.h>
> diff --git a/src/gstreamer/gstlibcamerapool.cpp b/src/gstreamer/gstlibcamerapool.cpp
> index 0b1a5689eadb..9cd7eccb5af3 100644
> --- a/src/gstreamer/gstlibcamerapool.cpp
> +++ b/src/gstreamer/gstlibcamerapool.cpp
> @@ -9,6 +9,7 @@
>  #include "gstlibcamerapool.h"
>  
>  #include <deque>
> +
>  #include <libcamera/stream.h>
>  
>  #include "gstlibcamera-utils.h"
> diff --git a/src/ipa/libipa/camera_sensor_helper.h b/src/ipa/libipa/camera_sensor_helper.h
> index ac276e27f523..758682058b9c 100644
> --- a/src/ipa/libipa/camera_sensor_helper.h
> +++ b/src/ipa/libipa/camera_sensor_helper.h
> @@ -7,10 +7,9 @@
>  
>  #pragma once
>  
> -#include <stdint.h>
> -
>  #include <memory>
>  #include <optional>
> +#include <stdint.h>
>  #include <string>
>  #include <vector>
>  
>
> base-commit: 62760bd2605a83e663b9003244ff42f8946f8955

Hi Laurent, thanks for the patch

On 10/08/2024 02:17, Laurent Pinchart wrote:
> The libcamera coding style groups the C and C++ standard library headers
> in a single group. Fix the few offenders in the source tree.
>
> While at it, add a missing blank line between header groups in a
> separate location.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>


Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>

> ---
>   include/libcamera/base/file.h         | 5 ++---
>   include/libcamera/ipa/ipa_interface.h | 3 +--
>   src/gstreamer/gstlibcamerapool.cpp    | 1 +
>   src/ipa/libipa/camera_sensor_helper.h | 3 +--
>   4 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/include/libcamera/base/file.h b/include/libcamera/base/file.h
> index 192668abeff1..6d3f106d5900 100644
> --- a/include/libcamera/base/file.h
> +++ b/include/libcamera/base/file.h
> @@ -7,11 +7,10 @@
>   
>   #pragma once
>   
> -#include <stdint.h>
> -#include <sys/types.h>
> -
>   #include <map>
> +#include <stdint.h>
>   #include <string>
> +#include <sys/types.h>
>   
>   #include <libcamera/base/private.h>
>   
> diff --git a/include/libcamera/ipa/ipa_interface.h b/include/libcamera/ipa/ipa_interface.h
> index 53cf5377fcc6..7c835e984442 100644
> --- a/include/libcamera/ipa/ipa_interface.h
> +++ b/include/libcamera/ipa/ipa_interface.h
> @@ -7,10 +7,9 @@
>   
>   #pragma once
>   
> +#include <map>
>   #include <stddef.h>
>   #include <stdint.h>
> -
> -#include <map>
>   #include <vector>
>   
>   #include <libcamera/base/flags.h>
> diff --git a/src/gstreamer/gstlibcamerapool.cpp b/src/gstreamer/gstlibcamerapool.cpp
> index 0b1a5689eadb..9cd7eccb5af3 100644
> --- a/src/gstreamer/gstlibcamerapool.cpp
> +++ b/src/gstreamer/gstlibcamerapool.cpp
> @@ -9,6 +9,7 @@
>   #include "gstlibcamerapool.h"
>   
>   #include <deque>
> +
>   #include <libcamera/stream.h>
>   
>   #include "gstlibcamera-utils.h"
> diff --git a/src/ipa/libipa/camera_sensor_helper.h b/src/ipa/libipa/camera_sensor_helper.h
> index ac276e27f523..758682058b9c 100644
> --- a/src/ipa/libipa/camera_sensor_helper.h
> +++ b/src/ipa/libipa/camera_sensor_helper.h
> @@ -7,10 +7,9 @@
>   
>   #pragma once
>   
> -#include <stdint.h>
> -
>   #include <memory>
>   #include <optional>
> +#include <stdint.h>
>   #include <string>
>   #include <vector>
>   
>
> base-commit: 62760bd2605a83e663b9003244ff42f8946f8955