[{"id":20056,"web_url":"https://patchwork.libcamera.org/comment/20056/","msgid":"","date":"2021-10-05T09:42:39","subject":"Re: [libcamera-devel] [RFC PATCH 3/6] qcam: Remove using namespace\n\tin header files","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Hiro,\n\nThank you for the patch.\n\nOn Tue, Oct 05, 2021 at 04:31:11PM +0900, Hirokazu Honda wrote:\n> \"using namespace\" in a header file propagates the namespace to\n> the files including the header file. So it should be avoided.\n> This removes \"using namespace\" in header files in qcam.\n> \n> Signed-off-by: Hirokazu Honda \n> ---\n> src/qcam/dng_writer.h | 10 ++++------\n> src/qcam/main.cpp | 2 +-\n> src/qcam/main_window.h | 40 ++++++++++++++++++++--------------------\n> 3 files changed, 25 insertions(+), 27 deletions(-)\n> \n> diff --git a/src/qcam/dng_writer.h b/src/qcam/dng_writer.h\n> index 20905f37..e4486288 100644\n> --- a/src/qcam/dng_writer.h\n> +++ b/src/qcam/dng_writer.h\n> @@ -15,15 +15,13 @@\n> #include \n> #include \n> \n> -using namespace libcamera;\n> -\n> class DNGWriter\n> {\n> public:\n> -\tstatic int write(const char *filename, const Camera *camera,\n> -\t\t\t const StreamConfiguration &config,\n> -\t\t\t const ControlList &metadata,\n> -\t\t\t const FrameBuffer *buffer, const void *data);\n> +\tstatic int write(const char *filename, const libcamera::Camera *camera,\n> +\t\t\t const libcamera::StreamConfiguration &config,\n> +\t\t\t const libcamera::ControlList &metadata,\n> +\t\t\t const libcamera::FrameBuffer *buffer, const void *data);\n> };\n> \n> #endif /* HAVE_TIFF */\n> diff --git a/src/qcam/main.cpp b/src/qcam/main.cpp\n> index 5eff90a3..b5dbf81b 100644\n> --- a/src/qcam/main.cpp\n> +++ b/src/qcam/main.cpp\n> @@ -66,7 +66,7 @@ int main(int argc, char **argv)\n> \tsa.sa_handler = &signalHandler;\n> \tsigaction(SIGINT, &sa, nullptr);\n> \n> -\tCameraManager *cm = new CameraManager();\n> +\tlibcamera::CameraManager *cm = new libcamera::CameraManager();\n\nI would have added a 'using namespace libcamera' in this file. It's not\na big deal as there's a single libcamera function being used here, but\nit would be more consistent.\n\nI can fix this when applying if desired.\n\nReviewed-by: Laurent Pinchart \n\n> \n> \tret = cm->start();\n> \tif (ret) {\n> diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> index a16bea09..4d8e806b 100644\n> --- a/src/qcam/main_window.h\n> +++ b/src/qcam/main_window.h\n> @@ -29,8 +29,6 @@\n> #include \"../cam/stream_options.h\"\n> #include \"viewfinder.h\"\n> \n> -using namespace libcamera;\n> -\n> class QAction;\n> class QComboBox;\n> \n> @@ -50,7 +48,8 @@ class MainWindow : public QMainWindow\n> \tQ_OBJECT\n> \n> public:\n> -\tMainWindow(CameraManager *cm, const OptionsParser::Options &options);\n> +\tMainWindow(libcamera::CameraManager *cm,\n> +\t\t const OptionsParser::Options &options);\n> \t~MainWindow();\n> \n> \tbool event(QEvent *e) override;\n> @@ -64,9 +63,10 @@ private Q_SLOTS:\n> \n> \tvoid saveImageAs();\n> \tvoid captureRaw();\n> -\tvoid processRaw(FrameBuffer *buffer, const ControlList &metadata);\n> +\tvoid processRaw(libcamera::FrameBuffer *buffer,\n> +\t\t\tconst libcamera::ControlList &metadata);\n> \n> -\tvoid queueRequest(FrameBuffer *buffer);\n> +\tvoid queueRequest(libcamera::FrameBuffer *buffer);\n> \n> private:\n> \tint createToolbars();\n> @@ -77,13 +77,13 @@ private:\n> \tint startCapture();\n> \tvoid stopCapture();\n> \n> -\tvoid addCamera(std::shared_ptr camera);\n> -\tvoid removeCamera(std::shared_ptr camera);\n> +\tvoid addCamera(std::shared_ptr camera);\n> +\tvoid removeCamera(std::shared_ptr camera);\n> \n> -\tvoid requestComplete(Request *request);\n> +\tvoid requestComplete(libcamera::Request *request);\n> \tvoid processCapture();\n> \tvoid processHotplug(HotplugEvent *e);\n> -\tvoid processViewfinder(FrameBuffer *buffer);\n> +\tvoid processViewfinder(libcamera::FrameBuffer *buffer);\n> \n> \t/* UI elements */\n> \tQToolBar *toolbar_;\n> @@ -102,21 +102,21 @@ private:\n> \tconst OptionsParser::Options &options_;\n> \n> \t/* Camera manager, camera, configuration and buffers */\n> -\tCameraManager *cm_;\n> -\tstd::shared_ptr camera_;\n> -\tFrameBufferAllocator *allocator_;\n> +\tlibcamera::CameraManager *cm_;\n> +\tstd::shared_ptr camera_;\n> +\tlibcamera::FrameBufferAllocator *allocator_;\n> \n> -\tstd::unique_ptr config_;\n> -\tstd::map> mappedBuffers_;\n> +\tstd::unique_ptr config_;\n> +\tstd::map> mappedBuffers_;\n> \n> \t/* Capture state, buffers queue and statistics */\n> \tbool isCapturing_;\n> \tbool captureRaw_;\n> -\tStream *vfStream_;\n> -\tStream *rawStream_;\n> -\tstd::map> freeBuffers_;\n> -\tQQueue doneQueue_;\n> -\tQQueue freeQueue_;\n> +\tlibcamera::Stream *vfStream_;\n> +\tlibcamera::Stream *rawStream_;\n> +\tstd::map> freeBuffers_;\n> +\tQQueue doneQueue_;\n> +\tQQueue freeQueue_;\n> \tQMutex mutex_; /* Protects freeBuffers_, doneQueue_, and freeQueue_ */\n> \n> \tuint64_t lastBufferTime_;\n> @@ -124,7 +124,7 @@ private:\n> \tuint32_t previousFrames_;\n> \tuint32_t framesCaptured_;\n> \n> -\tstd::vector> requests_;\n> +\tstd::vector> requests_;\n> };\n> \n> #endif /* __QCAM_MAIN_WINDOW__ */","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 DFDC0BDC71\n\tfor ;\n\tTue, 5 Oct 2021 09:42:48 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 62721691B9;\n\tTue, 5 Oct 2021 11:42:48 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A1095684C6\n\tfor ;\n\tTue, 5 Oct 2021 11:42:46 +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 1562225B;\n\tTue, 5 Oct 2021 11:42:46 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"l0efRuDl\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1633426966;\n\tbh=SKp1JwUOIbtAOlVBg866dGuzli8pBM0pGDJsLozp6qY=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=l0efRuDl8pfWz9MiwGmQolcn4FuSXRh+Qisz9gj25H4KVfYGbNYi45asn8HLYqHJ6\n\tB8J+FjkuEWpBEJ91BNZ3jIwvSN0RwDO7gbGBnfhJSB042uG68W2O1PJwMlrqgNgN6U\n\t/qN/LbWztlNApTLrhHFzUtQcUzwd5lUk3ysxVUxQ=","Date":"Tue, 5 Oct 2021 12:42:39 +0300","From":"Laurent Pinchart ","To":"Hirokazu Honda ","Message-ID":"","References":"<20211005073114.3997303-1-hiroh@chromium.org>\n\t<20211005073114.3997303-4-hiroh@chromium.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20211005073114.3997303-4-hiroh@chromium.org>","Subject":"Re: [libcamera-devel] [RFC PATCH 3/6] qcam: Remove using namespace\n\tin header files","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","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":20065,"web_url":"https://patchwork.libcamera.org/comment/20065/","msgid":"","date":"2021-10-05T10:25:06","subject":"Re: [libcamera-devel] [RFC PATCH 3/6] qcam: Remove using namespace\n\tin header files","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/people/63/","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"content":"Hi Laurent,\n\nOn Tue, Oct 5, 2021 at 6:42 PM Laurent Pinchart\n wrote:\n>\n> Hi Hiro,\n>\n> Thank you for the patch.\n>\n> On Tue, Oct 05, 2021 at 04:31:11PM +0900, Hirokazu Honda wrote:\n> > \"using namespace\" in a header file propagates the namespace to\n> > the files including the header file. So it should be avoided.\n> > This removes \"using namespace\" in header files in qcam.\n> >\n> > Signed-off-by: Hirokazu Honda \n> > ---\n> > src/qcam/dng_writer.h | 10 ++++------\n> > src/qcam/main.cpp | 2 +-\n> > src/qcam/main_window.h | 40 ++++++++++++++++++++--------------------\n> > 3 files changed, 25 insertions(+), 27 deletions(-)\n> >\n> > diff --git a/src/qcam/dng_writer.h b/src/qcam/dng_writer.h\n> > index 20905f37..e4486288 100644\n> > --- a/src/qcam/dng_writer.h\n> > +++ b/src/qcam/dng_writer.h\n> > @@ -15,15 +15,13 @@\n> > #include \n> > #include \n> >\n> > -using namespace libcamera;\n> > -\n> > class DNGWriter\n> > {\n> > public:\n> > - static int write(const char *filename, const Camera *camera,\n> > - const StreamConfiguration &config,\n> > - const ControlList &metadata,\n> > - const FrameBuffer *buffer, const void *data);\n> > + static int write(const char *filename, const libcamera::Camera *camera,\n> > + const libcamera::StreamConfiguration &config,\n> > + const libcamera::ControlList &metadata,\n> > + const libcamera::FrameBuffer *buffer, const void *data);\n> > };\n> >\n> > #endif /* HAVE_TIFF */\n> > diff --git a/src/qcam/main.cpp b/src/qcam/main.cpp\n> > index 5eff90a3..b5dbf81b 100644\n> > --- a/src/qcam/main.cpp\n> > +++ b/src/qcam/main.cpp\n> > @@ -66,7 +66,7 @@ int main(int argc, char **argv)\n> > sa.sa_handler = &signalHandler;\n> > sigaction(SIGINT, &sa, nullptr);\n> >\n> > - CameraManager *cm = new CameraManager();\n> > + libcamera::CameraManager *cm = new libcamera::CameraManager();\n>\n> I would have added a 'using namespace libcamera' in this file. It's not\n> a big deal as there's a single libcamera function being used here, but\n> it would be more consistent.\n>\n> I can fix this when applying if desired.\n>\n\nI am fine with it. Please feel free to do so if you prefer that.\n\n-Hiro\n\n> Reviewed-by: Laurent Pinchart \n>\n> >\n> > ret = cm->start();\n> > if (ret) {\n> > diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> > index a16bea09..4d8e806b 100644\n> > --- a/src/qcam/main_window.h\n> > +++ b/src/qcam/main_window.h\n> > @@ -29,8 +29,6 @@\n> > #include \"../cam/stream_options.h\"\n> > #include \"viewfinder.h\"\n> >\n> > -using namespace libcamera;\n> > -\n> > class QAction;\n> > class QComboBox;\n> >\n> > @@ -50,7 +48,8 @@ class MainWindow : public QMainWindow\n> > Q_OBJECT\n> >\n> > public:\n> > - MainWindow(CameraManager *cm, const OptionsParser::Options &options);\n> > + MainWindow(libcamera::CameraManager *cm,\n> > + const OptionsParser::Options &options);\n> > ~MainWindow();\n> >\n> > bool event(QEvent *e) override;\n> > @@ -64,9 +63,10 @@ private Q_SLOTS:\n> >\n> > void saveImageAs();\n> > void captureRaw();\n> > - void processRaw(FrameBuffer *buffer, const ControlList &metadata);\n> > + void processRaw(libcamera::FrameBuffer *buffer,\n> > + const libcamera::ControlList &metadata);\n> >\n> > - void queueRequest(FrameBuffer *buffer);\n> > + void queueRequest(libcamera::FrameBuffer *buffer);\n> >\n> > private:\n> > int createToolbars();\n> > @@ -77,13 +77,13 @@ private:\n> > int startCapture();\n> > void stopCapture();\n> >\n> > - void addCamera(std::shared_ptr camera);\n> > - void removeCamera(std::shared_ptr camera);\n> > + void addCamera(std::shared_ptr camera);\n> > + void removeCamera(std::shared_ptr camera);\n> >\n> > - void requestComplete(Request *request);\n> > + void requestComplete(libcamera::Request *request);\n> > void processCapture();\n> > void processHotplug(HotplugEvent *e);\n> > - void processViewfinder(FrameBuffer *buffer);\n> > + void processViewfinder(libcamera::FrameBuffer *buffer);\n> >\n> > /* UI elements */\n> > QToolBar *toolbar_;\n> > @@ -102,21 +102,21 @@ private:\n> > const OptionsParser::Options &options_;\n> >\n> > /* Camera manager, camera, configuration and buffers */\n> > - CameraManager *cm_;\n> > - std::shared_ptr camera_;\n> > - FrameBufferAllocator *allocator_;\n> > + libcamera::CameraManager *cm_;\n> > + std::shared_ptr camera_;\n> > + libcamera::FrameBufferAllocator *allocator_;\n> >\n> > - std::unique_ptr config_;\n> > - std::map> mappedBuffers_;\n> > + std::unique_ptr config_;\n> > + std::map> mappedBuffers_;\n> >\n> > /* Capture state, buffers queue and statistics */\n> > bool isCapturing_;\n> > bool captureRaw_;\n> > - Stream *vfStream_;\n> > - Stream *rawStream_;\n> > - std::map> freeBuffers_;\n> > - QQueue doneQueue_;\n> > - QQueue freeQueue_;\n> > + libcamera::Stream *vfStream_;\n> > + libcamera::Stream *rawStream_;\n> > + std::map> freeBuffers_;\n> > + QQueue doneQueue_;\n> > + QQueue freeQueue_;\n> > QMutex mutex_; /* Protects freeBuffers_, doneQueue_, and freeQueue_ */\n> >\n> > uint64_t lastBufferTime_;\n> > @@ -124,7 +124,7 @@ private:\n> > uint32_t previousFrames_;\n> > uint32_t framesCaptured_;\n> >\n> > - std::vector> requests_;\n> > + std::vector> requests_;\n> > };\n> >\n> > #endif /* __QCAM_MAIN_WINDOW__ */\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 65327C3243\n\tfor ;\n\tTue, 5 Oct 2021 10:25:21 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DEE246918C;\n\tTue, 5 Oct 2021 12:25:20 +0200 (CEST)","from mail-ed1-x536.google.com (mail-ed1-x536.google.com\n\t[IPv6:2a00:1450:4864:20::536])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9AF48684C6\n\tfor ;\n\tTue, 5 Oct 2021 12:25:19 +0200 (CEST)","by mail-ed1-x536.google.com with SMTP id dj4so77083857edb.5\n\tfor ;\n\tTue, 05 Oct 2021 03:25:19 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"JwMJSN1r\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=mime-version:references:in-reply-to:from:date:message-id:subject:to\n\t:cc; bh=HlUkvpbIfHkBBavCtecjkQGHLQiqFw8b2w1TBXZMMn4=;\n\tb=JwMJSN1rNn//2x1jx0vfJuZpAj5hLedd3lJKMvufZaJMCwJvr+S6+F9FzGvpWU6caM\n\tLkAKvS8RdROAko8Rmd8gf/aGBWTMDqePEYUNYESiVTPs3DTH7zqG5pizwEyF9oX3RgG3\n\tV3P7dxxsqGiHqWasVEAbpIGEJoSEGhas+KeI8=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:mime-version:references:in-reply-to:from:date\n\t:message-id:subject:to:cc;\n\tbh=HlUkvpbIfHkBBavCtecjkQGHLQiqFw8b2w1TBXZMMn4=;\n\tb=xbl0wHi+rptQus/0bj6T/7Nn4d7ouL9rFcH4iwo8nLJSXer6vUNHmt3imqI4AmgGxT\n\t9nd2V1iDUhalxBP0DKuFqg7amFWiydrInlYmYnEC4heTW2vqx1q7c646Kg3paoizhcDp\n\tuejnoFkrM+F2ZErid0sA8PTmNDInVF+5umz7TcGrucT6Dte4qNgF3MA7Q90+Xbo8laUp\n\t4DlcKpIoByKdDp8C639UZK2zdL5d7r26IJjj/B5PDaEDuEe43Ph5nl1La5KsO5oMPKwH\n\tFUZBq0ABZOt9sMM37LUqz+yw/dSJQ/1F1zJd0wzBLrieTdrVXmQI6dYIiIgAsC9HGuWa\n\tW9KQ==","X-Gm-Message-State":"AOAM532raaE/SDHuYPlLFv1IY5faAoLuC3/+w8bSR7K3dLqyoVXD9FkX\n\tvFnRbyrUfacEjrbHx7dyGjE8mRVp/grL7Tf3+GP8hi2atRg=","X-Google-Smtp-Source":"ABdhPJxmPzNiopkkmsTgB2WGcbYUtto/H4l/PkWtkpgEozvGDaco++NHAnTlUek83BUi/XrbSaixPKH6X1nfvqIpd0w=","X-Received":"by 2002:aa7:d3ce:: with SMTP id\n\to14mr24644950edr.354.1633429519187; \n\tTue, 05 Oct 2021 03:25:19 -0700 (PDT)","MIME-Version":"1.0","References":"<20211005073114.3997303-1-hiroh@chromium.org>\n\t<20211005073114.3997303-4-hiroh@chromium.org>\n\t","In-Reply-To":"","From":"Hirokazu Honda ","Date":"Tue, 5 Oct 2021 19:25:06 +0900","Message-ID":"","To":"Laurent Pinchart ","Content-Type":"text/plain; charset=\"UTF-8\"","Subject":"Re: [libcamera-devel] [RFC PATCH 3/6] qcam: Remove using namespace\n\tin header files","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","Cc":"libcamera devel ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]