From patchwork Tue Jan 13 00:07:41 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 25729 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 5CAD2C3274 for ; Tue, 13 Jan 2026 00:08:45 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0F15861FD7; Tue, 13 Jan 2026 01:08:45 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="JtXFrXfQ"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6AACB61FB7 for ; Tue, 13 Jan 2026 01:08:43 +0100 (CET) Received: from pendragon.ideasonboard.com (81-175-209-152.bb.dnainternet.fi [81.175.209.152]) by perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id C3255E01 for ; Tue, 13 Jan 2026 01:08:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1768262897; bh=bfT7qpF/HC7BIMsEeY0CWElwFAD6kAmdxnrN2dLU8tw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=JtXFrXfQWoZh2WY7bw6T/QzXTXuotJjIYhC86gB6rmldEW6RzaEEKsOtdAM+w1jei Kan+FQ/a2+cbJPzpCkIs38OmtrKpz26YCI6O6+L6dlc5m/qj02OcJ6FreG7qFAEJ7Q SuI+jAEMvOIh3hULqWqy8fx22CPdozbvWt0hwQZ4= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [PATCH 09/36] libcamera: yaml_parser: Rename Container to ValueContainer Date: Tue, 13 Jan 2026 02:07:41 +0200 Message-ID: <20260113000808.15395-10-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20260113000808.15395-1-laurent.pinchart@ideasonboard.com> References: <20260113000808.15395-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 --- 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_; };