{"id":2507,"url":"https://patchwork.libcamera.org/api/patches/2507/?format=json","web_url":"https://patchwork.libcamera.org/patch/2507/","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":"<20200104050947.7673-12-laurent.pinchart@ideasonboard.com>","date":"2020-01-04T05:09:44","name":"[libcamera-devel,11/14] libcamera: bound_method: Rename Bound*Method to BoundMethod*","commit_ref":"dce6bb0e301a7985b302143ff4405b5526ab5dd6","pull_url":null,"state":"accepted","archived":false,"hash":"90bff737347be3495d0155599a475b2b591e4a06","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/2507/mbox/","series":[{"id":600,"url":"https://patchwork.libcamera.org/api/series/600/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=600","date":"2020-01-04T05:09:33","name":"object: Propagate return value of invoked method","version":1,"mbox":"https://patchwork.libcamera.org/series/600/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2507/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2507/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9736D6061C\n\tfor ;\n\tSat, 4 Jan 2020 06:10:06 +0100 (CET)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 40566A49\n\tfor ;\n\tSat, 4 Jan 2020 06:10:06 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1578114606;\n\tbh=WQ8oKGiEHxLEe6inw2XBqzTx7rvBSKWenfsUDa1pBQk=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=TJlZGPlVJxch2nMrJGFSGRGhlvHOdwbqf6IKqfnWKf5cqiD4/M1d6PYriUJyjaQnk\n\tisdpCWAvRAeV7Kjh59+42+9K9ozPG1btblb+7SRnG1wnSxCWNzzRsxIzYPK5Gr4McI\n\t5aLKct8NmcSaCBbjJ8DDCyWlUY+iXiK/2N8tNkfo=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 4 Jan 2020 07:09:44 +0200","Message-Id":"<20200104050947.7673-12-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20200104050947.7673-1-laurent.pinchart@ideasonboard.com>","References":"<20200104050947.7673-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 11/14] libcamera: bound_method: Rename\n\tBound*Method to BoundMethod*","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","X-List-Received-Date":"Sat, 04 Jan 2020 05:10:08 -0000"},"content":"Most of the bound method classes are named with a BoundMethod prefix,\nexcept for BoundMemberMethod and BoundStaticMethod. Rename them to\nBoundMethodMember and BoundMethodStatic respectively to make the code\nmore coherent.\n\nSigned-off-by: Laurent Pinchart \n---\n Documentation/Doxyfile.in | 6 +++---\n include/libcamera/bound_method.h | 12 ++++++------\n include/libcamera/object.h | 2 +-\n include/libcamera/signal.h | 12 ++++++------\n 4 files changed, 16 insertions(+), 16 deletions(-)","diff":"diff --git a/Documentation/Doxyfile.in b/Documentation/Doxyfile.in\nindex 5ae8773bd3ad..8e6fbdbb92b6 100644\n--- a/Documentation/Doxyfile.in\n+++ b/Documentation/Doxyfile.in\n@@ -870,12 +870,12 @@ EXCLUDE_PATTERNS =\n # Note that the wildcards are matched against the file with absolute path, so to\n # exclude all test directories use the pattern */test/*\n \n-EXCLUDE_SYMBOLS = libcamera::BoundMemberMethod \\\n- libcamera::BoundMethodArgs \\\n+EXCLUDE_SYMBOLS = libcamera::BoundMethodArgs \\\n libcamera::BoundMethodBase \\\n+ libcamera::BoundMethodMember \\\n libcamera::BoundMethodPack \\\n libcamera::BoundMethodPackBase \\\n- libcamera::BoundStaticMethod \\\n+ libcamera::BoundMethodStatic \\\n libcamera::SignalBase \\\n std::*\n \ndiff --git a/include/libcamera/bound_method.h b/include/libcamera/bound_method.h\nindex 0a91f44a2054..ca501493bce2 100644\n--- a/include/libcamera/bound_method.h\n+++ b/include/libcamera/bound_method.h\n@@ -156,12 +156,12 @@ public:\n };\n \n template\n-class BoundMemberMethod : public BoundMethodArgs\n+class BoundMethodMember : public BoundMethodArgs\n {\n public:\n \tusing PackType = typename BoundMethodArgs::PackType;\n \n-\tBoundMemberMethod(T *obj, Object *object, R (T::*func)(Args...),\n+\tBoundMethodMember(T *obj, Object *object, R (T::*func)(Args...),\n \t\t\t ConnectionType type = ConnectionTypeAuto)\n \t\t: BoundMethodArgs(obj, object, type), func_(func)\n \t{\n@@ -189,12 +189,12 @@ private:\n };\n \n template\n-class BoundMemberMethod : public BoundMethodArgs\n+class BoundMethodMember : public BoundMethodArgs\n {\n public:\n \tusing PackType = typename BoundMethodArgs::PackType;\n \n-\tBoundMemberMethod(T *obj, Object *object, void (T::*func)(Args...),\n+\tBoundMethodMember(T *obj, Object *object, void (T::*func)(Args...),\n \t\t\t ConnectionType type = ConnectionTypeAuto)\n \t\t: BoundMethodArgs(obj, object, type), func_(func)\n \t{\n@@ -221,10 +221,10 @@ private:\n };\n \n template\n-class BoundStaticMethod : public BoundMethodArgs\n+class BoundMethodStatic : public BoundMethodArgs\n {\n public:\n-\tBoundStaticMethod(R (*func)(Args...))\n+\tBoundMethodStatic(R (*func)(Args...))\n \t\t: BoundMethodArgs(nullptr, nullptr, ConnectionTypeAuto),\n \t\t func_(func)\n \t{\ndiff --git a/include/libcamera/object.h b/include/libcamera/object.h\nindex 04aa18394d55..9344af30bc79 100644\n--- a/include/libcamera/object.h\n+++ b/include/libcamera/object.h\n@@ -35,7 +35,7 @@ public:\n \t\t Args... args)\n \t{\n \t\tT *obj = static_cast(this);\n-\t\tauto *method = new BoundMemberMethod(obj, this, func, type);\n+\t\tauto *method = new BoundMethodMember(obj, this, func, type);\n \t\treturn method->activate(args..., true);\n \t}\n \ndiff --git a/include/libcamera/signal.h b/include/libcamera/signal.h\nindex 7fbe5a2c528f..432d95d0ed1c 100644\n--- a/include/libcamera/signal.h\n+++ b/include/libcamera/signal.h\n@@ -60,7 +60,7 @@ public:\n \t{\n \t\tObject *object = static_cast(obj);\n \t\tobject->connect(this);\n-\t\tslots_.push_back(new BoundMemberMethod(obj, object, func, type));\n+\t\tslots_.push_back(new BoundMethodMember(obj, object, func, type));\n \t}\n \n \ttemplate::value>::type * = nullptr>\n@@ -69,13 +69,13 @@ public:\n #endif\n \tvoid connect(T *obj, R (T::*func)(Args...))\n \t{\n-\t\tslots_.push_back(new BoundMemberMethod(obj, nullptr, func));\n+\t\tslots_.push_back(new BoundMethodMember(obj, nullptr, func));\n \t}\n \n \ttemplate\n \tvoid connect(R (*func)(Args...))\n \t{\n-\t\tslots_.push_back(new BoundStaticMethod(func));\n+\t\tslots_.push_back(new BoundMethodStatic(func));\n \t}\n \n \tvoid disconnect()\n@@ -100,11 +100,11 @@ public:\n \t\t\t/*\n \t\t\t * If the object matches the slot, the slot is\n \t\t\t * guaranteed to be a member slot, so we can safely\n-\t\t\t * cast it to BoundMemberMethod to match\n+\t\t\t * cast it to BoundMethodMember to match\n \t\t\t * func.\n \t\t\t */\n \t\t\tif (slot->match(obj) &&\n-\t\t\t static_cast *>(slot)->match(func)) {\n+\t\t\t static_cast *>(slot)->match(func)) {\n \t\t\t\titer = slots_.erase(iter);\n \t\t\t\tdelete slot;\n \t\t\t} else {\n@@ -119,7 +119,7 @@ public:\n \t\tfor (auto iter = slots_.begin(); iter != slots_.end(); ) {\n \t\t\tBoundMethodArgs *slot = *iter;\n \t\t\tif (slot->match(nullptr) &&\n-\t\t\t static_cast *>(slot)->match(func)) {\n+\t\t\t static_cast *>(slot)->match(func)) {\n \t\t\t\titer = slots_.erase(iter);\n \t\t\t\tdelete slot;\n \t\t\t} else {\n","prefixes":["libcamera-devel","11/14"]}