From patchwork Tue Apr 7 15:33:54 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 26449 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 12F7DC32F9 for ; Tue, 7 Apr 2026 15:34:46 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 8B7A262DB4; Tue, 7 Apr 2026 17:34:45 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="p8zleIA6"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id AEF8162DB8 for ; Tue, 7 Apr 2026 17:34:40 +0200 (CEST) Received: from killaraus.ideasonboard.com (2001-14ba-703d-e500--2a1.rev.dnainternet.fi [IPv6:2001:14ba:703d:e500::2a1]) by perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 1CF786A6 for ; Tue, 7 Apr 2026 17:33:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1775575993; bh=Jvu+34nKMt/j7LRF2DnIfAkc2QDWjJUmgIR8EITtpkA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=p8zleIA6EzlKk5P3uxTYozU1EHDWtw6LrjWiUuybubUBpKoLPHvLruM0qZbvhiq5x O+SbAYDZaEANvYE9QgsQafo2sa/PD3e5n+YCFDnda9Up3HXIvL1UV2HAHHT9egHlu9 VOVL/JfWgYBjwveBe+rBLh5D8B15tq1L5O7+Ko0o= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [PATCH v2 09/42] libcamera: yaml_parser: Rename Container to ValueContainer Date: Tue, 7 Apr 2026 18:33:54 +0300 Message-ID: <20260407153427.1825999-10-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260407153427.1825999-1-laurent.pinchart@ideasonboard.com> References: <20260407153427.1825999-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 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" The YamlObject class defines two private types, Container and ListContainer. The format is an alias to std::vector, and is used to store child elements. The latter hasn't been used since commit 38987e165c28 ("libcamera: yaml_parser: Preserve order of items in dictionary"). To prepare for upcoming reworks that will use the name 'Container' as a template parameter, rename Container to ValueContainer for clarity, and drop the unused ListContainer type. Signed-off-by: Laurent Pinchart Reviewed-by: Barnabás Pőcze --- include/libcamera/internal/yaml_parser.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/include/libcamera/internal/yaml_parser.h b/include/libcamera/internal/yaml_parser.h index 8c7916565946..03d6a05e2d0f 100644 --- a/include/libcamera/internal/yaml_parser.h +++ b/include/libcamera/internal/yaml_parser.h @@ -36,8 +36,7 @@ private: std::unique_ptr value; }; - using Container = std::vector; - using ListContainer = std::vector>; + using ValueContainer = std::vector; public: #ifndef __DOXYGEN__ @@ -48,7 +47,7 @@ public: using difference_type = std::ptrdiff_t; using iterator_category = std::forward_iterator_tag; - Iterator(typename Container::const_iterator it) + Iterator(typename ValueContainer::const_iterator it) : it_(it) { } @@ -77,14 +76,14 @@ public: } protected: - Container::const_iterator it_; + ValueContainer::const_iterator it_; }; template class Adapter { public: - Adapter(const Container &container) + Adapter(const ValueContainer &container) : container_(container) { } @@ -100,7 +99,7 @@ public: } protected: - const Container &container_; + const ValueContainer &container_; }; class ListIterator : public Iterator @@ -232,7 +231,7 @@ private: Type type_; std::string value_; - Container list_; + ValueContainer list_; std::map> dictionary_; };