From patchwork Wed Oct 21 14:36:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 10166 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 785D7BDB13 for ; Wed, 21 Oct 2020 14:36:49 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2415C61E4E; Wed, 21 Oct 2020 16:36:49 +0200 (CEST) Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id F2FF861DE9 for ; Wed, 21 Oct 2020 16:36:46 +0200 (CEST) X-Originating-IP: 93.34.118.233 Received: from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233]) (Authenticated sender: jacopo@jmondi.org) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 996BEC0005; Wed, 21 Oct 2020 14:36:46 +0000 (UTC) From: Jacopo Mondi To: libcamera-devel@lists.libcamera.org Date: Wed, 21 Oct 2020 16:36:26 +0200 Message-Id: <20201021143635.22846-6-jacopo@jmondi.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201021143635.22846-1-jacopo@jmondi.org> References: <20201021143635.22846-1-jacopo@jmondi.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 05/14] libcamera: controls: Rename enumerate values 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Rename the enumeration of supported values with the suffix "Enum" in place of "Values" to prepare to re-use the suffix "Values" for the vector of Control's value introduced by the next patch. Signed-off-by: Jacopo Mondi Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- utils/gen-controls.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/gen-controls.py b/utils/gen-controls.py index 93cb3885c3da..bf681503f86a 100755 --- a/utils/gen-controls.py +++ b/utils/gen-controls.py @@ -24,9 +24,9 @@ def format_description(description): def generate_cpp(controls): enum_doc_start_template = string.Template('''/** - * \\enum ${name}Values + * \\enum ${name}Enum * \\brief Supported ${name} values''') - enum_doc_value_template = string.Template(''' * \\var ${name}Values::${value} + enum_doc_value_template = string.Template(''' * \\var ${name}Enum::${value} ${description}''') doc_template = string.Template('''/** * \\var ${name} @@ -98,7 +98,7 @@ ${description} def generate_h(controls): - enum_template_start = string.Template('''enum ${name}Values {''') + enum_template_start = string.Template('''enum ${name}Enum {''') enum_value_template = string.Template('''\t${name} = ${value},''') template = string.Template('''extern const Control<${type}> ${name};''')