From patchwork Fri May 22 14:54:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3840 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 7B680603D7 for ; Fri, 22 May 2020 16:55:19 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="h3WawItl"; dkim-atps=neutral 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 19A46528 for ; Fri, 22 May 2020 16:55:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1590159319; bh=fUcZv2BHrO81ER5WBhyLOJ756arZ1hinkUqNxKjLMmM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=h3WawItlS3jiWxZJPbXx1GLf6pX14II1T6kWpfVM5Ipn8cHeQxL6DvR9f8kuk012o mnkXZ3HpvReJqMnJmfTLlIU2xssyTSJVIuJ+A4J8umQ7eKePxfJ53i9r1kM+qXWAjK K6NV/5547hVgh0XUWWQ/8FoHX/jRa14RxLo1I5Ak= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Fri, 22 May 2020 17:54:48 +0300 Message-Id: <20200522145459.16836-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200522145459.16836-1-laurent.pinchart@ideasonboard.com> References: <20200522145459.16836-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH/RFC 01/11] libcamera: Rename pixelformats.{cpp, h} to pixel_format.{cpp, h} 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, 22 May 2020 14:55:19 -0000 The libcamera source files are named after class names, using snake_case. pixelformats.h and pixelformats.cpp don't comply with that rule. Fix them. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- include/libcamera/internal/formats.h | 2 +- include/libcamera/internal/v4l2_pixelformat.h | 2 +- include/libcamera/internal/v4l2_videodevice.h | 2 +- include/libcamera/meson.build | 2 +- include/libcamera/{pixelformats.h => pixel_format.h} | 8 ++++---- include/libcamera/stream.h | 2 +- src/libcamera/meson.build | 2 +- src/libcamera/pipeline/simple/converter.h | 2 +- src/libcamera/{pixelformats.cpp => pixel_format.cpp} | 8 ++++---- src/libcamera/v4l2_pixelformat.cpp | 2 +- src/qcam/format_converter.h | 2 +- src/qcam/viewfinder.h | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) rename include/libcamera/{pixelformats.h => pixel_format.h} (82%) rename src/libcamera/{pixelformats.cpp => pixel_format.cpp} (95%) diff --git a/include/libcamera/internal/formats.h b/include/libcamera/internal/formats.h index 4092a93ef973..4455b0f9b050 100644 --- a/include/libcamera/internal/formats.h +++ b/include/libcamera/internal/formats.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include "libcamera/internal/v4l2_pixelformat.h" diff --git a/include/libcamera/internal/v4l2_pixelformat.h b/include/libcamera/internal/v4l2_pixelformat.h index 0fe8a017de34..4d0e034b8b51 100644 --- a/include/libcamera/internal/v4l2_pixelformat.h +++ b/include/libcamera/internal/v4l2_pixelformat.h @@ -13,7 +13,7 @@ #include -#include +#include namespace libcamera { diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h index dc259523599c..c93cf816373b 100644 --- a/include/libcamera/internal/v4l2_videodevice.h +++ b/include/libcamera/internal/v4l2_videodevice.h @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include "libcamera/internal/formats.h" diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index 27760c19f9b9..73c5b999acf4 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -13,7 +13,7 @@ libcamera_public_headers = files([ 'geometry.h', 'logging.h', 'object.h', - 'pixelformats.h', + 'pixel_format.h', 'request.h', 'signal.h', 'span.h', diff --git a/include/libcamera/pixelformats.h b/include/libcamera/pixel_format.h similarity index 82% rename from include/libcamera/pixelformats.h rename to include/libcamera/pixel_format.h index 89966e5e664c..e3b371ef92bb 100644 --- a/include/libcamera/pixelformats.h +++ b/include/libcamera/pixel_format.h @@ -2,10 +2,10 @@ /* * Copyright (C) 2019, Google Inc. * - * pixelformats.h - libcamera pixel formats + * pixel_format.h - libcamera Pixel Format */ -#ifndef __LIBCAMERA_PIXEL_FORMATS_H__ -#define __LIBCAMERA_PIXEL_FORMATS_H__ +#ifndef __LIBCAMERA_PIXEL_FORMAT_H__ +#define __LIBCAMERA_PIXEL_FORMAT_H__ #include #include @@ -40,4 +40,4 @@ private: } /* namespace libcamera */ -#endif /* __LIBCAMERA_PIXEL_FORMATS_H__ */ +#endif /* __LIBCAMERA_PIXEL_FORMAT_H__ */ diff --git a/include/libcamera/stream.h b/include/libcamera/stream.h index b3cbea3d5229..1a68bd23a81a 100644 --- a/include/libcamera/stream.h +++ b/include/libcamera/stream.h @@ -14,7 +14,7 @@ #include #include -#include +#include namespace libcamera { diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index b88f295d251d..611fc061e1cf 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -34,7 +34,7 @@ libcamera_sources = files([ 'message.cpp', 'object.cpp', 'pipeline_handler.cpp', - 'pixelformats.cpp', + 'pixel_format.cpp', 'process.cpp', 'pub_key.cpp', 'request.cpp', diff --git a/src/libcamera/pipeline/simple/converter.h b/src/libcamera/pipeline/simple/converter.h index 1f770eb844b5..ef18cf73a2ed 100644 --- a/src/libcamera/pipeline/simple/converter.h +++ b/src/libcamera/pipeline/simple/converter.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include namespace libcamera { diff --git a/src/libcamera/pixelformats.cpp b/src/libcamera/pixel_format.cpp similarity index 95% rename from src/libcamera/pixelformats.cpp rename to src/libcamera/pixel_format.cpp index 1330dc5ab3d9..d8718739152d 100644 --- a/src/libcamera/pixelformats.cpp +++ b/src/libcamera/pixel_format.cpp @@ -2,14 +2,14 @@ /* * Copyright (C) 2019, Google Inc. * - * pixelformats.cpp - libcamera pixel formats + * pixel_format.cpp - libcamera Pixel Format */ -#include +#include /** - * \file pixelformats.h - * \brief libcamera pixel formats + * \file pixel_format.h + * \brief libcamera pixel format */ namespace libcamera { diff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp index 36776be99e59..94fae470f926 100644 --- a/src/libcamera/v4l2_pixelformat.cpp +++ b/src/libcamera/v4l2_pixelformat.cpp @@ -14,7 +14,7 @@ #include -#include +#include #include "libcamera/internal/formats.h" #include "libcamera/internal/log.h" diff --git a/src/qcam/format_converter.h b/src/qcam/format_converter.h index 5e28adf0ef63..e389b24a69f7 100644 --- a/src/qcam/format_converter.h +++ b/src/qcam/format_converter.h @@ -11,7 +11,7 @@ #include -#include +#include class QImage; diff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h index b3f1d25d9d60..26a1320537d2 100644 --- a/src/qcam/viewfinder.h +++ b/src/qcam/viewfinder.h @@ -17,7 +17,7 @@ #include #include -#include +#include #include "format_converter.h"