From patchwork Wed Jul 7 02:19:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 12835 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 360F5C3225 for ; Wed, 7 Jul 2021 02:20:50 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id DA9906852E; Wed, 7 Jul 2021 04:20:49 +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="mEDwUCZ8"; 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 573996853A for ; Wed, 7 Jul 2021 04:20:39 +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 E3F9D2E4 for ; Wed, 7 Jul 2021 04:20:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1625624439; bh=XXvwAraqA7EQyB8BiqYSJnwEwersAdH3nrmuPrap/hI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=mEDwUCZ8/itflinP0ud+ZLzLGnvyeMVCJA6sfh3+4+LhOPMVGWGYddgnma9pwxP1J pP+Zq9YqaeU075SE5yg+TSBinSS0Ul1RA86UdSG7sHC7IIaBAP+rN7nHmFrhbNX0Pj 9X6+g7AOa3GTfnz01Z32QTRXkxpIeSM94kCq8brs= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Wed, 7 Jul 2021 05:19:33 +0300 Message-Id: <20210707021941.20804-23-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210707021941.20804-1-laurent.pinchart@ideasonboard.com> References: <20210707021941.20804-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 22/30] 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 is static. While at is, drop an unneded 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;