From c77d894a8b2b441baafd7b2d689a1c668e56c382 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Fri, 23 Oct 2020 07:51:56 +0300
Subject: libcamera: Declare empty virtual destructors as defaulted

The base class of polymorphic classes is required to declare a
destructor. Several of these are empty, and can thus be declared as
defaulted.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Umang Jain <email@uajain.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/android/jpeg/encoder.h                   | 2 +-
 src/android/post_processor.h                 | 2 +-
 src/cam/options.h                            | 2 +-
 src/ipa/raspberrypi/controller/algorithm.hpp | 2 +-
 src/ipa/raspberrypi/md_parser.hpp            | 2 +-
 src/libcamera/pipeline/rkisp1/timeline.h     | 4 ++--
 src/qcam/viewfinder.h                        | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h
index 270ea609..0ca2ba38 100644
--- a/src/android/jpeg/encoder.h
+++ b/src/android/jpeg/encoder.h
@@ -14,7 +14,7 @@
 class Encoder
 {
 public:
-	virtual ~Encoder() {}
+	virtual ~Encoder() = default;
 
 	virtual int configure(const libcamera::StreamConfiguration &cfg) = 0;
 	virtual int encode(const libcamera::FrameBuffer &source,
diff --git a/src/android/post_processor.h b/src/android/post_processor.h
index 5f87a5d1..e0f91880 100644
--- a/src/android/post_processor.h
+++ b/src/android/post_processor.h
@@ -16,7 +16,7 @@ class CameraMetadata;
 class PostProcessor
 {
 public:
-	virtual ~PostProcessor() {}
+	virtual ~PostProcessor() = default;
 
 	virtual int configure(const libcamera::StreamConfiguration &inCfg,
 			      const libcamera::StreamConfiguration &outCfg) = 0;
diff --git a/src/cam/options.h b/src/cam/options.h
index 18486619..f02eeca2 100644
--- a/src/cam/options.h
+++ b/src/cam/options.h
@@ -73,7 +73,7 @@ public:
 	{
 	};
 
-	virtual ~KeyValueParser() {}
+	virtual ~KeyValueParser() = default;
 
 	bool addOption(const char *name, OptionType type, const char *help,
 		       OptionArgument argument = ArgumentNone);
diff --git a/src/ipa/raspberrypi/controller/algorithm.hpp b/src/ipa/raspberrypi/controller/algorithm.hpp
index 6196b2f9..17423f23 100644
--- a/src/ipa/raspberrypi/controller/algorithm.hpp
+++ b/src/ipa/raspberrypi/controller/algorithm.hpp
@@ -30,7 +30,7 @@ public:
 		: controller_(controller), paused_(false)
 	{
 	}
-	virtual ~Algorithm() {}
+	virtual ~Algorithm() = default;
 	virtual char const *Name() const = 0;
 	virtual bool IsPaused() const { return paused_; }
 	virtual void Pause() { paused_ = true; }
diff --git a/src/ipa/raspberrypi/md_parser.hpp b/src/ipa/raspberrypi/md_parser.hpp
index c9db62c0..926f676e 100644
--- a/src/ipa/raspberrypi/md_parser.hpp
+++ b/src/ipa/raspberrypi/md_parser.hpp
@@ -67,7 +67,7 @@ public:
 		ERROR = 2
 	};
 	MdParser() : reset_(true) {}
-	virtual ~MdParser() {}
+	virtual ~MdParser() = default;
 	void Reset() { reset_ = true; }
 	void SetBitsPerPixel(int bpp) { bits_per_pixel_ = bpp; }
 	void SetNumLines(unsigned int num_lines) { num_lines_ = num_lines; }
diff --git a/src/libcamera/pipeline/rkisp1/timeline.h b/src/libcamera/pipeline/rkisp1/timeline.h
index 88f99329..0c37b06f 100644
--- a/src/libcamera/pipeline/rkisp1/timeline.h
+++ b/src/libcamera/pipeline/rkisp1/timeline.h
@@ -22,7 +22,7 @@ public:
 	FrameAction(unsigned int frame, unsigned int type)
 		: frame_(frame), type_(type) {}
 
-	virtual ~FrameAction() {}
+	virtual ~FrameAction() = default;
 
 	unsigned int frame() const { return frame_; }
 	unsigned int type() const { return type_; }
@@ -38,7 +38,7 @@ class Timeline
 {
 public:
 	Timeline();
-	virtual ~Timeline() {}
+	virtual ~Timeline() = default;
 
 	virtual void reset();
 	virtual void scheduleAction(std::unique_ptr<FrameAction> action);
diff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h
index 67da1df2..e33dc452 100644
--- a/src/qcam/viewfinder.h
+++ b/src/qcam/viewfinder.h
@@ -22,7 +22,7 @@ struct MappedBuffer {
 class ViewFinder
 {
 public:
-	virtual ~ViewFinder() {}
+	virtual ~ViewFinder() = default;
 
 	virtual const QList<libcamera::PixelFormat> &nativeFormats() const = 0;
 
-- 
cgit v1.2.1