From f1cac536f40fca701aa3ba4fe19d2f326c8bcc8e Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 4 Jun 2020 03:39:30 +0300 Subject: libcamera: Mark logPrefix() implementations with override MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Virtual functions overriden in derived classes should be marked with the override keyword. Do so for the logPrefix() implementations inheriting from the Loggable class. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Reviewed-by: Niklas Söderlund --- include/libcamera/internal/camera_sensor.h | 2 +- include/libcamera/internal/media_device.h | 2 +- include/libcamera/internal/v4l2_subdevice.h | 2 +- include/libcamera/internal/v4l2_videodevice.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h index d79bd9ce..eb464114 100644 --- a/include/libcamera/internal/camera_sensor.h +++ b/include/libcamera/internal/camera_sensor.h @@ -66,7 +66,7 @@ public: int sensorInfo(CameraSensorInfo *info) const; protected: - std::string logPrefix() const; + std::string logPrefix() const override; private: const MediaEntity *entity_; diff --git a/include/libcamera/internal/media_device.h b/include/libcamera/internal/media_device.h index 19af059d..20e397cc 100644 --- a/include/libcamera/internal/media_device.h +++ b/include/libcamera/internal/media_device.h @@ -55,7 +55,7 @@ public: Signal disconnected; protected: - std::string logPrefix() const; + std::string logPrefix() const override; private: int open(); diff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h index 1be454f0..07dc93d9 100644 --- a/include/libcamera/internal/v4l2_subdevice.h +++ b/include/libcamera/internal/v4l2_subdevice.h @@ -62,7 +62,7 @@ public: const std::string &entity); protected: - std::string logPrefix() const; + std::string logPrefix() const override; private: std::vector enumPadCodes(unsigned int pad); diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h index dc259523..cbaee614 100644 --- a/include/libcamera/internal/v4l2_videodevice.h +++ b/include/libcamera/internal/v4l2_videodevice.h @@ -213,7 +213,7 @@ public: V4L2PixelFormat toV4L2PixelFormat(const PixelFormat &pixelFormat); protected: - std::string logPrefix() const; + std::string logPrefix() const override; private: int getFormatMeta(V4L2DeviceFormat *format); -- cgit v1.2.1