From patchwork Thu Jul 15 21:14:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 12995 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 30DF1C322B for ; Thu, 15 Jul 2021 21:15:31 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C08A468540; Thu, 15 Jul 2021 23:15:30 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="sorRQRqT"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 05C8568541 for ; Thu, 15 Jul 2021 23:15:13 +0200 (CEST) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id ABF03340 for ; Thu, 15 Jul 2021 23:15:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1626383712; bh=jOy4SyKjUDyf+//EBxL2A6r7aABK3WzCl6iZMitMA/w=; h=From:To:Subject:Date:In-Reply-To:References:From; b=sorRQRqTF/7jw7zGS60mm4zhwvfT/rIV1jSy5uBxeJ8Azh/O0NPKFdClvnfWzAnrI j+UvE+G2+KWn18sK9qriBXUYJaWslHWs8q1dWcxsnO9aVmbLnXFk0rSwaxtj5v3vUZ QIinBbOGVdu3t5uJCm3CfV1l+mY5uqh2Utf8OJ1M= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Fri, 16 Jul 2021 00:14:51 +0300 Message-Id: <20210715211459.19373-26-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210715211459.19373-1-laurent.pinchart@ideasonboard.com> References: <20210715211459.19373-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 25/33] cam: Make CamApp::cameraName() static 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 CamApp::cameraName() doesn't need to access any member of the CamApp class. Make it static. While at it, drop an unneeded const from the return value. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/cam/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cam/main.cpp b/src/cam/main.cpp index 19ed9837cf4f..03e62f305f24 100644 --- a/src/cam/main.cpp +++ b/src/cam/main.cpp @@ -44,7 +44,7 @@ private: int infoConfiguration(); int run(); - std::string const cameraName(const Camera *camera); + static std::string cameraName(const Camera *camera); static CamApp *app_; OptionsParser::Options options_; @@ -319,7 +319,7 @@ int CamApp::run() return 0; } -std::string const CamApp::cameraName(const Camera *camera) +std::string CamApp::cameraName(const Camera *camera) { const ControlList &props = camera->properties(); bool addModel = true;