[libcamera-devel,5/8] qcam: main_window: Fix include ordering
diff mbox series

Message ID 20211206233948.1351206-6-kieran.bingham@ideasonboard.com
State Accepted
Delegated to: Kieran Bingham
Headers show
Series
  • Request metadata: SensorSequence
Related show

Commit Message

Kieran Bingham Dec. 6, 2021, 11:39 p.m. UTC
The libcamera coding style has libcamera headers after system headers,
and before any other library headers.

Move the libcamera headers above the QT headers accordingly.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/qcam/main_window.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Laurent Pinchart Dec. 7, 2021, 12:10 a.m. UTC | #1
Hi Kieran,

Thank you for the patch.

On Mon, Dec 06, 2021 at 11:39:45PM +0000, Kieran Bingham wrote:
> The libcamera coding style has libcamera headers after system headers,
> and before any other library headers.

I've always considered the Qt headers to be part of the "system" from
the point of view of a Qt application :-)

> Move the libcamera headers above the QT headers accordingly.

s/QT/Qt/

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

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  src/qcam/main_window.cpp | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp
> index ae51fa672a8c..dd0e51f55b70 100644
> --- a/src/qcam/main_window.cpp
> +++ b/src/qcam/main_window.cpp
> @@ -11,6 +11,9 @@
>  #include <iomanip>
>  #include <string>
>  
> +#include <libcamera/camera_manager.h>
> +#include <libcamera/version.h>
> +
>  #include <QComboBox>
>  #include <QCoreApplication>
>  #include <QFileDialog>
> @@ -25,9 +28,6 @@
>  #include <QToolButton>
>  #include <QtDebug>
>  
> -#include <libcamera/camera_manager.h>
> -#include <libcamera/version.h>
> -
>  #include "../cam/image.h"
>  #include "dng_writer.h"
>  #ifndef QT_NO_OPENGL
Umang Jain Dec. 7, 2021, 1:56 p.m. UTC | #2
Hi

On 12/7/21 5:09 AM, Kieran Bingham wrote:
> The libcamera coding style has libcamera headers after system headers,
> and before any other library headers.
>
> Move the libcamera headers above the QT headers accordingly.
>
> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>


Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>

> ---
>   src/qcam/main_window.cpp | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp
> index ae51fa672a8c..dd0e51f55b70 100644
> --- a/src/qcam/main_window.cpp
> +++ b/src/qcam/main_window.cpp
> @@ -11,6 +11,9 @@
>   #include <iomanip>
>   #include <string>
>   
> +#include <libcamera/camera_manager.h>
> +#include <libcamera/version.h>
> +
>   #include <QComboBox>
>   #include <QCoreApplication>
>   #include <QFileDialog>
> @@ -25,9 +28,6 @@
>   #include <QToolButton>
>   #include <QtDebug>
>   
> -#include <libcamera/camera_manager.h>
> -#include <libcamera/version.h>
> -
>   #include "../cam/image.h"
>   #include "dng_writer.h"
>   #ifndef QT_NO_OPENGL

Patch
diff mbox series

diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp
index ae51fa672a8c..dd0e51f55b70 100644
--- a/src/qcam/main_window.cpp
+++ b/src/qcam/main_window.cpp
@@ -11,6 +11,9 @@ 
 #include <iomanip>
 #include <string>
 
+#include <libcamera/camera_manager.h>
+#include <libcamera/version.h>
+
 #include <QComboBox>
 #include <QCoreApplication>
 #include <QFileDialog>
@@ -25,9 +28,6 @@ 
 #include <QToolButton>
 #include <QtDebug>
 
-#include <libcamera/camera_manager.h>
-#include <libcamera/version.h>
-
 #include "../cam/image.h"
 #include "dng_writer.h"
 #ifndef QT_NO_OPENGL