From patchwork Mon Mar 23 14:21:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3245 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0ABE16041A for ; Mon, 23 Mar 2020 15:22:19 +0100 (CET) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A82AC308 for ; Mon, 23 Mar 2020 15:22:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1584973338; bh=4XLUshCMNIt87XB720GbiwJWGezmI9nsCi4TKE0C6kU=; h=From:To:Subject:Date:In-Reply-To:References:From; b=CErJPVeoZzWA1TMEux6MpAnpnVD53E9OtbSYZmTSrcIUfYzog74xOVQiMsexUFQ1w K9AOm0Id/bSqKNWAsvCkN3xETyiOxL3pMY9p8SwGenPqrHHXCP3O0x1NFvfLpF75Sz j8Gzxq9jpSQToxj8olJXoVt8gFswR92xcd50MNyA= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Mon, 23 Mar 2020 16:21:46 +0200 Message-Id: <20200323142205.28342-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200323142205.28342-1-laurent.pinchart@ideasonboard.com> References: <20200323142205.28342-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 02/21] qcam: Ensure headers are self-contained X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Mar 2020 14:22:19 -0000 Include the headers corresponding to each compile unit at the very first line to ensure they are self-contained. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/qcam/format_converter.cpp | 4 ++-- src/qcam/main_window.cpp | 3 ++- 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 483f7c1edfce..d8962a28c06c 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 #include -#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 6f4f1cd770bd..66aaf40c5d45 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 #include #include @@ -25,7 +27,6 @@ #include #include -#include "main_window.h" #include "viewfinder.h" using namespace libcamera; diff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder.cpp index e9d5cc1e014b..f4602f07c5d2 100644 --- a/src/qcam/viewfinder.cpp +++ b/src/qcam/viewfinder.cpp @@ -5,13 +5,14 @@ * viewfinder.cpp - qcam - Viewfinder */ +#include "viewfinder.h" + #include #include #include #include #include "format_converter.h" -#include "viewfinder.h" ViewFinder::ViewFinder(QWidget *parent) : QWidget(parent), format_(0), width_(0), height_(0), image_(nullptr)