[{"id":23745,"web_url":"https://patchwork.libcamera.org/comment/23745/","msgid":"<20220705164640.GA429415@gmail.com>","date":"2022-07-05T16:46:40","subject":"Re: [libcamera-devel] [PATCH] qcam: main_window: Fix include\n\tordering","submitter":{"id":114,"url":"https://patchwork.libcamera.org/api/people/114/","name":"Utkarsh Tiwari","email":"utkarsh02t@gmail.com"},"content":"On Tue, Jul 05, 2022 at 04:32:48PM +0100, Kieran Bingham via libcamera-devel wrote:\n> Fix the sort order of the QT headers to match the expected\n> sort from clang-format.\n> \n> Signed-off-by: Kieran Bingham \n> ---\n> src/qcam/main_window.h | 17 +++++++++--------\n> 1 file changed, 9 insertions(+), 8 deletions(-)\n> \n> diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> index 3fbe872c0b5b..fc70920f990c 100644\n> --- a/src/qcam/main_window.h\n> +++ b/src/qcam/main_window.h\n> @@ -10,14 +10,6 @@\n> #include \n> #include \n> \n> -#include \n> -#include \n> -#include \n> -#include \n> -#include \n> -#include \n> -#include \n> -\n> #include \n> #include \n> #include \n> @@ -26,7 +18,16 @@\n> #include \n> #include \n> \n> +#include \n> +#include \n> +#include \n> +#include \n> +#include \n> +#include \n> +#include \n> +\n> #include \"../cam/stream_options.h\"\n> +\n> #include \"viewfinder.h\"\n> \n> class QAction;\n> -- \n> 2.34.1\n> \n\nThis can also include the fix to ordering in main_window.cpp\n\n--- a/src/qcam/main_window.cpp\n+++ b/src/qcam/main_window.cpp\n@@ -30,6 +30,7 @@\n #include \n \n #include \"../cam/image.h\"\n+\n #include \"dng_writer.h\"\n #ifndef QT_NO_OPENGL\n #include \"viewfinder_gl.h\"","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 1ABDDBE173\n\tfor ;\n\tTue, 5 Jul 2022 16:46:47 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 856DF6330C;\n\tTue, 5 Jul 2022 18:46:46 +0200 (CEST)","from mail-pg1-x535.google.com (mail-pg1-x535.google.com\n\t[IPv6:2607:f8b0:4864:20::535])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 399E061FB0\n\tfor ;\n\tTue, 5 Jul 2022 18:46:45 +0200 (CEST)","by mail-pg1-x535.google.com with SMTP id g4so11881620pgc.1\n\tfor ;\n\tTue, 05 Jul 2022 09:46:45 -0700 (PDT)","from gmail.com ([2406:3003:2005:1c27:31f5:7636:2233:16d6])\n\tby smtp.gmail.com with ESMTPSA id\n\t22-20020aa79116000000b00527af57598fsm16891194pfh.43.2022.07.05.09.46.42\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 05 Jul 2022 09:46:43 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1657039606;\n\tbh=/bJsEDhc68BHzjDFEYkDMBxSwifOrViBvH9SeQ2gbP8=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=1Z3mwd9pmnTFOR6Yx12QB3J/Cf0EUXBaKptlOHETpZ5stQLfd4+x8g07fJGEGPQbO\n\tFsqwqrvHwMYIzXNaeQDCUWJjg392fxNSukFS880JuygZ4yBF/+Rf/g3kdzuW/CKNSo\n\tVnbN5myPjHrgaYETjKYSlIDboqGEGN+HwxyGgpmoGtwcp7onPrK67r5nF2/a5258Ng\n\tVdLapsFjawtM1MgG2Vv+Rqa4kp2rx0jTbiMBmV5shDAM8KvlONJegVhl3x1UHaETFc\n\t845Ipslq68ep2hM1ePJv0O2s/hjVOASU9+B+cm3KQhujMa4jwjAMxdeJG/VInH6oJS\n\t1Gq+Aw6svi+1Q==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;\n\th=date:from:to:cc:subject:message-id:mail-followup-to:references\n\t:mime-version:content-disposition:in-reply-to;\n\tbh=fYybp8vru4DMam+e14Tsw+MVrqqdDks++wEeKdKbnro=;\n\tb=JU6o3RRxqs6U0oaudIcMlYJVjIvAAHYLkkg55MfYOWmcajd5K1xKfwa3jMNx1eYvKc\n\tM2sSbutXgHI6ZfwvbrSRtYZuw53yk/LnhS8AVmDIkC3UxAISY9dOgqNK/ZOYAj8635fr\n\tSiL0k1a439tHzgnU18k9dteuCiF0IPCx4pFU10jSl4aCJRT+kG9HBgM9AS9KmgamfAKr\n\txRC5zS2N9mKD86ou8zXJavgd5qZaWco2J6dfQBBwCq8vtcuI8MEAzEIs42LMyHPMJzzR\n\tGDWpMylULjw9ae40ZpA6Jt/abE53um7UPSp5HRKNqfE0aulxEJVLYBIyyy4JFvvF3LyZ\n\txYaA=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"JU6o3RRx\"; dkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id\n\t:mail-followup-to:references:mime-version:content-disposition\n\t:in-reply-to;\n\tbh=fYybp8vru4DMam+e14Tsw+MVrqqdDks++wEeKdKbnro=;\n\tb=wiUaQm5qSX0fphPdEUPma/K0Dng0RVAS7TS8EZ0z3T39dDmbNLXIrUcTFkTgenNMYx\n\tq/Sbg0xbkHbugyJN+1vMS8qOAWK2LDsikG2nSkr9SOxoohPqTS4Kv+eopqQiQgnW181p\n\t5bQTZEDGCNgJaS5AZxLFoU/Mk5cxYlTiRZ5rdLH/nGBPs3xZk/5Veq8gAYILSdj30b6K\n\t5zqCiZnEpohtEx86xs05DuRES/DT9XGVloc4XcTm9OdBBSqyXWUFT+VyChPKGz73Tu/Y\n\txd5Ock2TaaRdx+AOTd0nDw7X6GyXgi8ZSlfuoPVkA0znbBzdpoYU4/+BqoyixybFGV1x\n\tnCQA==","X-Gm-Message-State":"AJIora8JHnCd0diUemXmY79QIiAKwA1jE1P9gpb2Uolg9Bus/TzGasxp\n\tfOs08PDmXM/N4w6YbeGJyWJBuVA+kShWmA==","X-Google-Smtp-Source":"AGRyM1tt27AjJtj2S1ZnrfF8HnUjzpXlE4EPjotLB1Sal+JWVDJnovLJoFiu2SAPwYfFIdTeEx9//Q==","X-Received":"by 2002:a63:3fcc:0:b0:408:c856:dd6d with SMTP id\n\tm195-20020a633fcc000000b00408c856dd6dmr30662956pga.354.1657039603649; \n\tTue, 05 Jul 2022 09:46:43 -0700 (PDT)","Date":"Wed, 6 Jul 2022 00:46:40 +0800","To":"Kieran Bingham ","Message-ID":"<20220705164640.GA429415@gmail.com>","Mail-Followup-To":"Kieran Bingham ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20220705153248.2343275-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<20220705153248.2343275-1-kieran.bingham@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH] qcam: main_window: Fix include\n\tordering","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Utkarsh Tiwari via libcamera-devel\n\t","Reply-To":"Utkarsh Tiwari ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":23746,"web_url":"https://patchwork.libcamera.org/comment/23746/","msgid":"<165703999034.2021905.96436027956610986@Monstersaurus>","date":"2022-07-05T16:53:10","subject":"Re: [libcamera-devel] [PATCH] qcam: main_window: Fix include\n\tordering","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Utkarsh,\n\nQuoting Utkarsh Tiwari (2022-07-05 17:46:40)\n> On Tue, Jul 05, 2022 at 04:32:48PM +0100, Kieran Bingham via libcamera-devel wrote:\n> > Fix the sort order of the QT headers to match the expected\n> > sort from clang-format.\n> > \n> > Signed-off-by: Kieran Bingham \n> > ---\n> > src/qcam/main_window.h | 17 +++++++++--------\n> > 1 file changed, 9 insertions(+), 8 deletions(-)\n> > \n> > diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> > index 3fbe872c0b5b..fc70920f990c 100644\n> > --- a/src/qcam/main_window.h\n> > +++ b/src/qcam/main_window.h\n> > @@ -10,14 +10,6 @@\n> > #include \n> > #include \n> > \n> > -#include \n> > -#include \n> > -#include \n> > -#include \n> > -#include \n> > -#include \n> > -#include \n> > -\n> > #include \n> > #include \n> > #include \n> > @@ -26,7 +18,16 @@\n> > #include \n> > #include \n> > \n> > +#include \n> > +#include \n> > +#include \n> > +#include \n> > +#include \n> > +#include \n> > +#include \n> > +\n> > #include \"../cam/stream_options.h\"\n> > +\n> > #include \"viewfinder.h\"\n> > \n> > class QAction;\n> > -- \n> > 2.34.1\n> > \n> \n> This can also include the fix to ordering in main_window.cpp\n> \n> --- a/src/qcam/main_window.cpp\n> +++ b/src/qcam/main_window.cpp\n> @@ -30,6 +30,7 @@\n> #include \n> \n> #include \"../cam/image.h\"\n> +\n> #include \"dng_writer.h\"\n> #ifndef QT_NO_OPENGL\n> #include \"viewfinder_gl.h\"\n> \n\nAha, that's what I get for sending out an old patch that I had in my\ntree without 're-working' it.\n\nThe cam/image must have come in after I originally made this patch.\n\nThanks - I'll update and repost.\n\n--\nKieran","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 008A3BD1F1\n\tfor ;\n\tTue, 5 Jul 2022 16:53:15 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6D3606330C;\n\tTue, 5 Jul 2022 18:53:15 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C171461FB0\n\tfor ;\n\tTue, 5 Jul 2022 18:53:13 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 46E556BB;\n\tTue, 5 Jul 2022 18:53:13 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1657039995;\n\tbh=DI4F6rS3TcexxTDj4PDrKTS8J1mJtWfCbJuP7MVHCCM=;\n\th=In-Reply-To:References:To:Date:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=T+crzKVmvp4Pxxxo92lSzB+hZwRzoKzXOgj7KWtkKLz/sMUG6+J+WiCy/9bpLtaT4\n\trs3tXt1qdwbgUDwrwaZKb9hW2GhGwrseQr0cjz9XI2l4r1YxUSQ+x3ec2Uabs2+Brq\n\t1ujjn2jLhnapMHW8BFx+HfazFBvm8ZKdrR08StmEAo+9GBcWpXKAHWTT7a2sWGscIE\n\tfhZ1aFxHroqSAibmEbKGWg45JJ5ZhPDr+IbAb3uanuqEKEtxq5LFSKwu/T+IlYcQeB\n\teQm8wIji7hwnsF8sUkEizulHXQqd1jaStZDInG33jzj7PB22JfUo4Y8ZIT1YvUX+nI\n\tG3NMh/kWw7zYg==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1657039993;\n\tbh=DI4F6rS3TcexxTDj4PDrKTS8J1mJtWfCbJuP7MVHCCM=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=vAx2yrMa/kY6c5FDO+QIvMr3sITOoGn9+mC7GoFVPy28/9BkQkd949SX+BExNZzrc\n\tI5EESDCd0fLz/VuYZp9s6l9SYFQDdXdQweyNVte+Fbb8fDwNB+uGlBdzOMOkrzYH/w\n\tHJkNiCsC918hT5Yv4IxcOKt6+xu3po2Xi3EkURGs="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"vAx2yrMa\"; dkim-atps=neutral","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20220705164640.GA429415@gmail.com>","References":"<20220705153248.2343275-1-kieran.bingham@ideasonboard.com>\n\t<20220705164640.GA429415@gmail.com>","To":"Utkarsh Tiwari ","Date":"Tue, 05 Jul 2022 17:53:10 +0100","Message-ID":"<165703999034.2021905.96436027956610986@Monstersaurus>","User-Agent":"alot/0.10","Subject":"Re: [libcamera-devel] [PATCH] qcam: main_window: Fix include\n\tordering","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Kieran Bingham via libcamera-devel\n\t","Reply-To":"Kieran Bingham ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":23752,"web_url":"https://patchwork.libcamera.org/comment/23752/","msgid":"","date":"2022-07-05T20:30:10","subject":"Re: [libcamera-devel] [PATCH] qcam: main_window: Fix include\n\tordering","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"On Tue, Jul 05, 2022 at 05:53:10PM +0100, Kieran Bingham via libcamera-devel wrote:\n> Quoting Utkarsh Tiwari (2022-07-05 17:46:40)\n> > On Tue, Jul 05, 2022 at 04:32:48PM +0100, Kieran Bingham via libcamera-devel wrote:\n> > > Fix the sort order of the QT headers to match the expected\n> > > sort from clang-format.\n> > > \n> > > Signed-off-by: Kieran Bingham \n> > > ---\n> > > src/qcam/main_window.h | 17 +++++++++--------\n> > > 1 file changed, 9 insertions(+), 8 deletions(-)\n> > > \n> > > diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> > > index 3fbe872c0b5b..fc70920f990c 100644\n> > > --- a/src/qcam/main_window.h\n> > > +++ b/src/qcam/main_window.h\n> > > @@ -10,14 +10,6 @@\n> > > #include \n> > > #include \n> > > \n> > > -#include \n> > > -#include \n> > > -#include \n> > > -#include \n> > > -#include \n> > > -#include \n> > > -#include \n> > > -\n> > > #include \n> > > #include \n> > > #include \n> > > @@ -26,7 +18,16 @@\n> > > #include \n> > > #include \n> > > \n> > > +#include \n> > > +#include \n> > > +#include \n> > > +#include \n> > > +#include \n> > > +#include \n> > > +#include \n> > > +\n> > > #include \"../cam/stream_options.h\"\n> > > +\n> > > #include \"viewfinder.h\"\n> > > \n> > > class QAction;\n> > > -- \n> > > 2.34.1\n> > > \n> > \n> > This can also include the fix to ordering in main_window.cpp\n> > \n> > --- a/src/qcam/main_window.cpp\n> > +++ b/src/qcam/main_window.cpp\n> > @@ -30,6 +30,7 @@\n> > #include \n> > \n> > #include \"../cam/image.h\"\n> > +\n> > #include \"dng_writer.h\"\n> > #ifndef QT_NO_OPENGL\n> > #include \"viewfinder_gl.h\"\n> > \n> \n> Aha, that's what I get for sending out an old patch that I had in my\n> tree without 're-working' it.\n> \n> The cam/image must have come in after I originally made this patch.\n> \n> Thanks - I'll update and repost.\n\nWhile at it, you can s/QT/Qt/ in the commit message.","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 26BDEBD1F1\n\tfor ;\n\tTue, 5 Jul 2022 20:30:37 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CE1D463310;\n\tTue, 5 Jul 2022 22:30:36 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E651161FB0\n\tfor ;\n\tTue, 5 Jul 2022 22:30:34 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 777026BB;\n\tTue, 5 Jul 2022 22:30:34 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1657053036;\n\tbh=deZw+brhCC7jC7t6cTiwYfeJOYOgHGhuhoeCT8ZXO+s=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=AW2P6lAhIfjMzOL7RUoYFfo3VzpfNwOtfSm7eBp8N1ZUpyCdwhyBvQsdUevqSsjb5\n\tec5B6uUXNgq2g5sTsDFOVJoJWJdyeGDw3Ul48FPgB0LBv32mc7TRwsw+viNGEvQU/N\n\t27LDpub4f+B8OIrv+gOiGKVurK25+0T4SkoL0K8ZmPtdT3+EwZK4r8NzvwZv1ea6//\n\tfLEEnI5AWU+/avhtur9tKhJuEXfqhVjyzSmtkNTeBOdB5KYt3RfbMJbazotyUIvw+B\n\t3DU+E2N46wI0ulVIh+5Sr+XAZ0mdYRZ3WLlIBoEKhznfZY2W/2QiAPIcOMRu91ag3a\n\tLT5+dAxHJiqZA==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1657053034;\n\tbh=deZw+brhCC7jC7t6cTiwYfeJOYOgHGhuhoeCT8ZXO+s=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Tg277l25rlZit0UHza2ipFOOL0WfQN2DGHkdqWNV4eA8DivB6kT6NoJfSlChQryNV\n\t2Y1MQki5CqVPA8AE1wNK9jhHQMKAfA64SpRh8JM3GRaADAICmgQs+bkng9Pv2fjOGv\n\tXW2ECMh8775lTJuRYOrI1h2v7Hdepspjej8nbzNU="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"Tg277l25\"; dkim-atps=neutral","Date":"Tue, 5 Jul 2022 23:30:10 +0300","To":"Kieran Bingham ","Message-ID":"","References":"<20220705153248.2343275-1-kieran.bingham@ideasonboard.com>\n\t<20220705164640.GA429415@gmail.com>\n\t<165703999034.2021905.96436027956610986@Monstersaurus>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<165703999034.2021905.96436027956610986@Monstersaurus>","Subject":"Re: [libcamera-devel] [PATCH] qcam: main_window: Fix include\n\tordering","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":23762,"web_url":"https://patchwork.libcamera.org/comment/23762/","msgid":"<165709854707.2021905.15207261098255236673@Monstersaurus>","date":"2022-07-06T09:09:07","subject":"Re: [libcamera-devel] [PATCH] qcam: main_window: Fix include\n\tordering","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Laurent Pinchart (2022-07-05 21:30:10)\n> On Tue, Jul 05, 2022 at 05:53:10PM +0100, Kieran Bingham via libcamera-devel wrote:\n> > Quoting Utkarsh Tiwari (2022-07-05 17:46:40)\n> > > On Tue, Jul 05, 2022 at 04:32:48PM +0100, Kieran Bingham via libcamera-devel wrote:\n> > > > Fix the sort order of the QT headers to match the expected\n> > > > sort from clang-format.\n> > > > \n> > > > Signed-off-by: Kieran Bingham \n> > > > ---\n> > > > src/qcam/main_window.h | 17 +++++++++--------\n> > > > 1 file changed, 9 insertions(+), 8 deletions(-)\n> > > > \n> > > > diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> > > > index 3fbe872c0b5b..fc70920f990c 100644\n> > > > --- a/src/qcam/main_window.h\n> > > > +++ b/src/qcam/main_window.h\n> > > > @@ -10,14 +10,6 @@\n> > > > #include \n> > > > #include \n> > > > \n> > > > -#include \n> > > > -#include \n> > > > -#include \n> > > > -#include \n> > > > -#include \n> > > > -#include \n> > > > -#include \n> > > > -\n> > > > #include \n> > > > #include \n> > > > #include \n> > > > @@ -26,7 +18,16 @@\n> > > > #include \n> > > > #include \n> > > > \n> > > > +#include \n> > > > +#include \n> > > > +#include \n> > > > +#include \n> > > > +#include \n> > > > +#include \n> > > > +#include \n> > > > +\n> > > > #include \"../cam/stream_options.h\"\n> > > > +\n> > > > #include \"viewfinder.h\"\n> > > > \n> > > > class QAction;\n> > > > -- \n> > > > 2.34.1\n> > > > \n> > > \n> > > This can also include the fix to ordering in main_window.cpp\n> > > \n> > > --- a/src/qcam/main_window.cpp\n> > > +++ b/src/qcam/main_window.cpp\n> > > @@ -30,6 +30,7 @@\n> > > #include \n> > > \n> > > #include \"../cam/image.h\"\n> > > +\n> > > #include \"dng_writer.h\"\n> > > #ifndef QT_NO_OPENGL\n> > > #include \"viewfinder_gl.h\"\n> > > \n> > \n> > Aha, that's what I get for sending out an old patch that I had in my\n> > tree without 're-working' it.\n> > \n> > The cam/image must have come in after I originally made this patch.\n\naha, this is in the .cpp file not the .h. That's why I didn't see it -\nbut yes, it's still relevant to update in this patch.\n\n> > \n> > Thanks - I'll update and repost.\n> \n> While at it, you can s/QT/Qt/ in the commit message.\n> \n> -- \n> Regards,\n> \n> Laurent Pinchart","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id C17E9BE173\n\tfor ;\n\tWed, 6 Jul 2022 09:09:12 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 33D286330C;\n\tWed, 6 Jul 2022 11:09:12 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1BD9A60400\n\tfor ;\n\tWed, 6 Jul 2022 11:09:10 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 92E9A593;\n\tWed, 6 Jul 2022 11:09:09 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1657098552;\n\tbh=uHoi3/8M8xSw549rBFKiSaE7ENwBaugECx0qKs6HQyU=;\n\th=In-Reply-To:References:To:Date:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=QshIMR1+1UWm38SKe9YJc5f07RGOvHQYvDPkCqqAS0a3ksTIY6uHqp+xbfU1n+0xH\n\t6RDIs0SjQThbVpRZkFx5gRXt+d6uIcYKdFy6AWZE8dPX235Mnk0T5ugo5fbQX/yI6Y\n\tjMoBI9YP3yiDeMJkXqYj6n12/jZdYNYUzrO2MIg+th5LRwwKcust+9Xd54/ZCBbcOl\n\tJU8TRq1Lvlaw5rHHChsLbO9ZdVXqVDv2/Pnd87lGyFDFn9gscPFPI3SDMSIlOOcrAQ\n\tvZZYzyqsOYK81vqWmZkaY/VAx6JnkVB3pQLEKLwKXJxIDiKxZfurvIS626Ytahg/Bm\n\tqTbh/XcXyZtVw==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1657098549;\n\tbh=uHoi3/8M8xSw549rBFKiSaE7ENwBaugECx0qKs6HQyU=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=Z+yxGD3ISgtBrQyoaISJcKxjUb4hQ4+8xsVSbELftT9fxMPzL6B3yXOw1u2w7NzBL\n\t67yhr1znXSdop0hT7Nh7sEvRXMyr9wVPkp12t1zBCOR4B576g8qpsiA1UEUDEj0T26\n\tAkl4rc8P37S5b/I3TnoQzw1ERH1xTVtCKx8dbVcU="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"Z+yxGD3I\"; dkim-atps=neutral","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"","References":"<20220705153248.2343275-1-kieran.bingham@ideasonboard.com>\n\t<20220705164640.GA429415@gmail.com>\n\t<165703999034.2021905.96436027956610986@Monstersaurus>\n\t","To":"Laurent Pinchart ","Date":"Wed, 06 Jul 2022 10:09:07 +0100","Message-ID":"<165709854707.2021905.15207261098255236673@Monstersaurus>","User-Agent":"alot/0.10","Subject":"Re: [libcamera-devel] [PATCH] qcam: main_window: Fix include\n\tordering","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Kieran Bingham via libcamera-devel\n\t","Reply-To":"Kieran Bingham ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]