[libcamera-devel] [PATCH v2] qcam: main_window: Fix include ordering

[Kieran Bingham]

Quoting Laurent Pinchart (2022-07-06 10:15:39)
> Hi Kieran,
> 
> Thank you for the patch.
> 
> On Wed, Jul 06, 2022 at 10:10:09AM +0100, Kieran Bingham via libcamera-devel wrote:
> > Fix the sort order of the Qt headers to match the expected
> > sort from clang-format.
> 
> Did you mean "the expected order" ?

Well, the "expected sort order" yes.

> 
> > Signed-off-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
> 
> Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> 
> > ---
> > v2:
> >  - Update .cpp file as well
> > 
> >  src/qcam/main_window.cpp |  1 +
> >  src/qcam/main_window.h   | 17 +++++++++--------
> >  2 files changed, 10 insertions(+), 8 deletions(-)
> > 
> > diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp
> > index dd0e51f55b70..7433d647e8a0 100644
> > --- a/src/qcam/main_window.cpp
> > +++ b/src/qcam/main_window.cpp
> > @@ -29,6 +29,7 @@
> >  #include <QtDebug>
> >  
> >  #include "../cam/image.h"
> > +
> >  #include "dng_writer.h"
> >  #ifndef QT_NO_OPENGL
> >  #include "viewfinder_gl.h"
> > diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h
> > index 3fbe872c0b5b..fc70920f990c 100644
> > --- a/src/qcam/main_window.h
> > +++ b/src/qcam/main_window.h
> > @@ -10,14 +10,6 @@
> >  #include <memory>
> >  #include <vector>
> >  
> > -#include <QElapsedTimer>
> > -#include <QIcon>
> > -#include <QMainWindow>
> > -#include <QMutex>
> > -#include <QObject>
> > -#include <QQueue>
> > -#include <QTimer>
> > -
> >  #include <libcamera/camera.h>
> >  #include <libcamera/camera_manager.h>
> >  #include <libcamera/controls.h>
> > @@ -26,7 +18,16 @@
> >  #include <libcamera/request.h>
> >  #include <libcamera/stream.h>
> >  
> > +#include <QElapsedTimer>
> > +#include <QIcon>
> > +#include <QMainWindow>
> > +#include <QMutex>
> > +#include <QObject>
> > +#include <QQueue>
> > +#include <QTimer>
> > +
> >  #include "../cam/stream_options.h"
> > +
> >  #include "viewfinder.h"
> >  
> >  class QAction;
> 
> -- 
> Regards,
> 
> Laurent Pinchart