diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-03-23 01:27:33 +0200 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-03-24 10:33:41 +0200 |
commit | ac02d741dceb081d1166b78e13f180a3a375579d (patch) | |
tree | 857078abbeef85b352dfd0d0901f3fd8214fad0a | |
parent | 01590c3f780598572b3a18decefed55ae8e51059 (diff) |
qcam: Ensure headers are self-contained
Include the headers corresponding to each compile unit at the very first
line to ensure they are self-contained.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
-rw-r--r-- | src/qcam/format_converter.cpp | 4 | ||||
-rw-r--r-- | src/qcam/main_window.cpp | 3 | ||||
-rw-r--r-- | src/qcam/viewfinder.cpp | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/qcam/format_converter.cpp b/src/qcam/format_converter.cpp index 483f7c1e..d8962a28 100644 --- a/src/qcam/format_converter.cpp +++ b/src/qcam/format_converter.cpp @@ -5,12 +5,12 @@ * format_convert.cpp - qcam - Convert buffer to RGB */ +#include "format_converter.h" + #include <errno.h> #include <QImage> -#include "format_converter.h" - #define RGBSHIFT 8 #ifndef MAX #define MAX(a,b) ((a)>(b)?(a):(b)) diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index 6f4f1cd7..66aaf40c 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -5,6 +5,8 @@ * main_window.cpp - qcam - Main application window */ +#include "main_window.h" + #include <iomanip> #include <iostream> #include <string> @@ -25,7 +27,6 @@ #include <libcamera/camera_manager.h> #include <libcamera/version.h> -#include "main_window.h" #include "viewfinder.h" using namespace libcamera; diff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder.cpp index e9d5cc1e..f4602f07 100644 --- a/src/qcam/viewfinder.cpp +++ b/src/qcam/viewfinder.cpp @@ -5,13 +5,14 @@ * viewfinder.cpp - qcam - Viewfinder */ +#include "viewfinder.h" + #include <QImage> #include <QImageWriter> #include <QMutexLocker> #include <QPainter> #include "format_converter.h" -#include "viewfinder.h" ViewFinder::ViewFinder(QWidget *parent) : QWidget(parent), format_(0), width_(0), height_(0), image_(nullptr) |