From patchwork Wed Jul 6 09:10:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 16559 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id EA711BE173 for ; Wed, 6 Jul 2022 09:10:14 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B384363312; Wed, 6 Jul 2022 11:10:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1657098614; bh=LapQfzCYekt1Edc1PpLJScrSIC9x0jdreo7gUl+rp/I=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=uiDe42u3QucEmRhHx3picI+xf25FTDDvlb1K1yiVccwyeBaUsd2YtRsW7ugyRn9zp BYVG9nWlDtmjk4CMhoBYbX2WntFbNOPx5yuQaACdXuzX0Bj52yfGTp9aAO4xh13pVW KqKiX4o900LlL+lAJgxrMD8AYyfszvz7GUetZJ7pRpmagvPEGaAI8Jlg7HldKMCK/s gm3AJsPbbduVEnNr+v8TFE7vouVAvw6DZTDoSL8u34pExsW8vqVniv10KH4DmF5FM9 3utdP/USTQVexURySJXtg7rNierFR3pc0xqRG7yzBedVqBIjsoKUpdODx79eOMhNBw /YkrJkMJxjo4A== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E29736330C for ; Wed, 6 Jul 2022 11:10:13 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="h1Blt5Nu"; dkim-atps=neutral Received: from Monstersaurus.ksquared.org.uk.beta.tailscale.net (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 3A41A593; Wed, 6 Jul 2022 11:10:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1657098613; bh=LapQfzCYekt1Edc1PpLJScrSIC9x0jdreo7gUl+rp/I=; h=From:To:Cc:Subject:Date:From; b=h1Blt5NuXCmF/5GShx+LyP++a7vBDODUZOTNNO5xyIl9R2T9NckDu2q9gcPsltA+Z hSkJOLLi/bwSwhAKARo3yF2ZEIq0qL1m4GaqVyX5fjtTiUUFohAO9BgVPBAc8DAEDV uEdbUX6DffKT4Nq5G5niVo13ObaJMDGsxJrCJX74= To: libcamera devel Date: Wed, 6 Jul 2022 10:10:09 +0100 Message-Id: <20220706091009.2752567-1-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2] qcam: main_window: Fix include ordering 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-Patchwork-Original-From: Kieran Bingham via libcamera-devel From: Kieran Bingham Reply-To: Kieran Bingham Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Fix the sort order of the Qt headers to match the expected sort from clang-format. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- 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 #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 #include -#include -#include -#include -#include -#include -#include -#include - #include #include #include @@ -26,7 +18,16 @@ #include #include +#include +#include +#include +#include +#include +#include +#include + #include "../cam/stream_options.h" + #include "viewfinder.h" class QAction;