{"id":13522,"url":"https://patchwork.libcamera.org/api/patches/13522/?format=json","web_url":"https://patchwork.libcamera.org/patch/13522/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210827023829.5871-2-laurent.pinchart@ideasonboard.com>","date":"2021-08-27T02:38:24","name":"[libcamera-devel,v1,1/6] libcamera: Use simpler Signal::disconnect() function","commit_ref":"eb5c4ead8842ff91b7b32b25f78531e79c17e1b3","pull_url":null,"state":"accepted","archived":false,"hash":"b8d4203daf97c86122b26fa7de8663398fc46073","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13522/mbox/","series":[{"id":2402,"url":"https://patchwork.libcamera.org/api/series/2402/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2402","date":"2021-08-27T02:38:23","name":"libcamera: Drop emitter object pointer from signal arguments","version":1,"mbox":"https://patchwork.libcamera.org/series/2402/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13522/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13522/checks/","tags":{},"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 1A795BD87D\n\tfor ;\n\tFri, 27 Aug 2021 02:38:50 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 90BB168920;\n\tFri, 27 Aug 2021 04:38:48 +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 56C4368920\n\tfor ;\n\tFri, 27 Aug 2021 04:38:46 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id DADF9739\n\tfor ;\n\tFri, 27 Aug 2021 04:38:45 +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=\"oEtzj+be\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1630031926;\n\tbh=A78D8AItOpk0oS9bj5WE47DSTohUsopQK6EwoK7txjU=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=oEtzj+beX3W5b5VMeLp4zT/y1Y0YRftGOjvuhUxyTwybfBkeyHJS54zzBObDG5fBM\n\tBMJ/YEXKYt9oupBHFzVN7HNTO0HXaPlmwzr6NIpPpGP8VyhHC/EV4ezJHKtuWDlGqX\n\txNYdvdS0Y20X4Du4Jm4ZCF+nrECdRie93aAUS4Sk=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 27 Aug 2021 05:38:24 +0300","Message-Id":"<20210827023829.5871-2-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210827023829.5871-1-laurent.pinchart@ideasonboard.com>","References":"<20210827023829.5871-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v1 1/6] libcamera: Use simpler\n\tSignal::disconnect() function","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"When disconnecting a signal from a receiver, it is usually not necessary\nto specify the receiver's slot function explicitly, as the signal is\noften connected to a single slot for a given receiver. We can thus use a\nsimpler version of Signal::disconnect() that takes a pointer to the\nreceiver object only. This reduces code size, as the disconnect()\nfunction is a template function.\n\nSigned-off-by: Laurent Pinchart \n---\n src/lc-compliance/simple_capture.cpp | 2 +-\n src/libcamera/camera_manager.cpp | 2 +-\n src/qcam/main_window.cpp | 4 ++--\n test/camera/camera_reconfigure.cpp | 2 +-\n 4 files changed, 5 insertions(+), 5 deletions(-)","diff":"diff --git a/src/lc-compliance/simple_capture.cpp b/src/lc-compliance/simple_capture.cpp\nindex 25097f28a603..ab5cb35c11f2 100644\n--- a/src/lc-compliance/simple_capture.cpp\n+++ b/src/lc-compliance/simple_capture.cpp\n@@ -62,7 +62,7 @@ void SimpleCapture::stop()\n \n \tcamera_->stop();\n \n-\tcamera_->requestCompleted.disconnect(this, &SimpleCapture::requestComplete);\n+\tcamera_->requestCompleted.disconnect(this);\n \n \tStream *stream = config_->at(0).stream();\n \tallocator_->free(stream);\ndiff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex fe80a46f5d20..08457030b6f7 100644\n--- a/src/libcamera/camera_manager.cpp\n+++ b/src/libcamera/camera_manager.cpp\n@@ -170,7 +170,7 @@ void CameraManager::Private::createPipelineHandlers()\n \n void CameraManager::Private::cleanup()\n {\n-\tenumerator_->devicesAdded.disconnect(this, &Private::createPipelineHandlers);\n+\tenumerator_->devicesAdded.disconnect(this);\n \n \t/*\n \t * Release all references to cameras to ensure they all get destroyed\ndiff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\nindex 1adaae60d83b..dea81bb43774 100644\n--- a/src/qcam/main_window.cpp\n+++ b/src/qcam/main_window.cpp\n@@ -531,7 +531,7 @@ int MainWindow::startCapture()\n \treturn 0;\n \n error_disconnect:\n-\tcamera_->requestCompleted.disconnect(this, &MainWindow::requestComplete);\n+\tcamera_->requestCompleted.disconnect(this);\n \tcamera_->stop();\n \n error:\n@@ -571,7 +571,7 @@ void MainWindow::stopCapture()\n \tif (ret)\n \t\tqInfo() << \"Failed to stop capture\";\n \n-\tcamera_->requestCompleted.disconnect(this, &MainWindow::requestComplete);\n+\tcamera_->requestCompleted.disconnect(this);\n \n \tfor (auto &iter : mappedBuffers_) {\n \t\tconst Span &buffer = iter.second;\ndiff --git a/test/camera/camera_reconfigure.cpp b/test/camera/camera_reconfigure.cpp\nindex 5adef16e1c9e..48d61c00709c 100644\n--- a/test/camera/camera_reconfigure.cpp\n+++ b/test/camera/camera_reconfigure.cpp\n@@ -130,7 +130,7 @@ private:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tcamera_->requestCompleted.disconnect(this, &CameraReconfigure::requestComplete);\n+\t\tcamera_->requestCompleted.disconnect(this);\n \n \t\trequests_.clear();\n \n","prefixes":["libcamera-devel","v1","1/6"]}