From e2d1344c7c4960da1f57e656c87c4599d81988aa Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Mon, 25 Dec 2017 12:34:07 -0500
Subject: Remove trivial destructors and use default where possible

---
 ingen/AtomReader.hpp         | 1 -
 ingen/AtomSink.hpp           | 2 +-
 ingen/AtomWriter.hpp         | 2 --
 ingen/EngineBase.hpp         | 2 +-
 ingen/LV2Features.hpp        | 2 +-
 ingen/Module.hpp             | 2 +-
 ingen/Parser.hpp             | 4 ++--
 ingen/Properties.hpp         | 7 ++-----
 ingen/Resource.hpp           | 2 --
 ingen/URIMap.hpp             | 1 -
 ingen/client/ObjectModel.hpp | 2 --
 11 files changed, 8 insertions(+), 19 deletions(-)

(limited to 'ingen')

diff --git a/ingen/AtomReader.hpp b/ingen/AtomReader.hpp
index 9b2406e9..bca56022 100644
--- a/ingen/AtomReader.hpp
+++ b/ingen/AtomReader.hpp
@@ -50,7 +50,6 @@ public:
 	           URIs&      uris,
 	           Log&       log,
 	           Interface& iface);
-	~AtomReader() override {}
 
 	static bool is_message(const URIs& uris, const LV2_Atom* msg);
 
diff --git a/ingen/AtomSink.hpp b/ingen/AtomSink.hpp
index 73ea2423..0cfa027a 100644
--- a/ingen/AtomSink.hpp
+++ b/ingen/AtomSink.hpp
@@ -29,7 +29,7 @@ namespace Ingen {
  */
 class INGEN_API AtomSink {
 public:
-	virtual ~AtomSink() {}
+	virtual ~AtomSink() = default;
 
 	/** Write an Atom to the sink.
 	 *
diff --git a/ingen/AtomWriter.hpp b/ingen/AtomWriter.hpp
index 72124b36..5d465706 100644
--- a/ingen/AtomWriter.hpp
+++ b/ingen/AtomWriter.hpp
@@ -43,8 +43,6 @@ class INGEN_API AtomWriter : public Interface
 public:
 	AtomWriter(URIMap& map, URIs& uris, AtomSink& sink);
 
-	~AtomWriter() override;
-
 	Raul::URI uri() const override {
 		return Raul::URI("ingen:/clients/atom_writer");
 	}
diff --git a/ingen/EngineBase.hpp b/ingen/EngineBase.hpp
index c8154c4c..00436c66 100644
--- a/ingen/EngineBase.hpp
+++ b/ingen/EngineBase.hpp
@@ -36,7 +36,7 @@ class Interface;
 class INGEN_API EngineBase
 {
 public:
-	virtual ~EngineBase() {}
+	virtual ~EngineBase() = default;
 
 	/**
 	   Initialise the engine for local use (e.g. without a Jack driver).
diff --git a/ingen/LV2Features.hpp b/ingen/LV2Features.hpp
index f718b22f..91e57dc6 100644
--- a/ingen/LV2Features.hpp
+++ b/ingen/LV2Features.hpp
@@ -40,7 +40,7 @@ public:
 
 	class Feature {
 	public:
-		virtual ~Feature() {}
+		virtual ~Feature() = default;
 
 		virtual const char* uri() const = 0;
 
diff --git a/ingen/Module.hpp b/ingen/Module.hpp
index c21bf25e..e1884074 100644
--- a/ingen/Module.hpp
+++ b/ingen/Module.hpp
@@ -33,7 +33,7 @@ class World;
 class INGEN_API Module {
 public:
 	Module() : library(nullptr) {}
-	virtual ~Module() {}
+	virtual ~Module() = default;
 
 	virtual void load(Ingen::World* world) = 0;
 	virtual void run(Ingen::World* world) {}
diff --git a/ingen/Parser.hpp b/ingen/Parser.hpp
index e87f34e7..19db3f8b 100644
--- a/ingen/Parser.hpp
+++ b/ingen/Parser.hpp
@@ -42,9 +42,9 @@ class World;
 */
 class INGEN_API Parser {
 public:
-	explicit Parser() {}
+	explicit Parser() = default;
 
-	virtual ~Parser() {}
+	virtual ~Parser() = default;
 
 	/** Record of a resource listed in a bundle manifest. */
 	struct ResourceRecord {
diff --git a/ingen/Properties.hpp b/ingen/Properties.hpp
index ef914e68..39d6cf81 100644
--- a/ingen/Properties.hpp
+++ b/ingen/Properties.hpp
@@ -57,11 +57,8 @@ class Properties : public std::multimap<Raul::URI, Property> {
 public:
 	using Graph = Property::Graph;
 
-	Properties() {}
-
-	Properties(const Properties& copy)
-		: std::multimap<Raul::URI, Property>(copy)
-	{}
+	Properties() = default;
+	Properties(const Properties& copy) = default;
 
 	Properties(std::initializer_list<value_type> l)
 		: std::multimap<Raul::URI, Property>(l)
diff --git a/ingen/Resource.hpp b/ingen/Resource.hpp
index d19d5c9a..aa047e51 100644
--- a/ingen/Resource.hpp
+++ b/ingen/Resource.hpp
@@ -73,8 +73,6 @@ public:
 		return Graph::DEFAULT;
 	}
 
-	~Resource() override {}
-
 	/** Get a single property value.
 	 *
 	 * This is only useful for properties with a single value.  If the
diff --git a/ingen/URIMap.hpp b/ingen/URIMap.hpp
index 71cfb239..b07d4f50 100644
--- a/ingen/URIMap.hpp
+++ b/ingen/URIMap.hpp
@@ -40,7 +40,6 @@ class World;
 class INGEN_API URIMap : public Raul::Noncopyable {
 public:
 	URIMap(Log& log, LV2_URID_Map* map, LV2_URID_Unmap* unmap);
-	virtual ~URIMap() {}
 
 	uint32_t    map_uri(const char* uri);
 	uint32_t    map_uri(const std::string& uri) { return map_uri(uri.c_str()); }
diff --git a/ingen/client/ObjectModel.hpp b/ingen/client/ObjectModel.hpp
index 42849110..a8210ac0 100644
--- a/ingen/client/ObjectModel.hpp
+++ b/ingen/client/ObjectModel.hpp
@@ -56,8 +56,6 @@ class ClientStore;
 class INGEN_API ObjectModel : public Node
 {
 public:
-	virtual ~ObjectModel();
-
 	bool is_a(const URIs::Quark& type) const;
 
 	const Atom& get_property(const Raul::URI& key) const;
-- 
cgit v1.2.1