From patchwork Fri Nov 8 20:53:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 2303 Return-Path: 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 C1E0D61516 for ; Fri, 8 Nov 2019 21:54:24 +0100 (CET) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 5991631D; Fri, 8 Nov 2019 21:54:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1573246464; bh=T+KwLux/OSOYDRaBtiIFJ3C9yYPkiGWFWzXvJP3/kXY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IWqFzdzycqSSqfkR6LBWkovWaEhA4AN8fd3yxR674E5GqMGbLJdTbS4+ws7qmxwZC zqHItl/alYa3+yTE7fSj/U+1YhGEgNeLG6snXpe0Kj0p/VkL4+coMqgH/8m9A8TGvb oKkEu2pUc5TEedBCLvf+EA55B1diRNPvsNBfVPOQ= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Fri, 8 Nov 2019 22:53:52 +0200 Message-Id: <20191108205409.18845-8-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191108205409.18845-1-laurent.pinchart@ideasonboard.com> References: <20191108205409.18845-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 07/24] libcamera: controls: Make ControlId constructor public 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: , X-List-Received-Date: Fri, 08 Nov 2019 20:54:26 -0000 From: Jacopo Mondi In order to be able to create a ControlId from serialized data, make its constructor public. Signed-off-by: Jacopo Mondi Reviewed-by: Niklas Söderlund --- include/libcamera/controls.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index 548c06c65bb6..6bad36cbc369 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -59,16 +59,15 @@ private: class ControlId { public: - unsigned int id() const { return id_; } - const std::string &name() const { return name_; } - ControlType type() const { return type_; } - -protected: ControlId(unsigned int id, const std::string &name, ControlType type) : id_(id), name_(name), type_(type) { } + unsigned int id() const { return id_; } + const std::string &name() const { return name_; } + ControlType type() const { return type_; } + private: ControlId &operator=(const ControlId &) = delete; ControlId(const ControlId &) = delete;