From a31a7f5a6ce3f47716a9313d232c2a40955fd1e1 Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Mon, 3 Jan 2022 18:52:15 +0000
Subject: Use C++11 default initializers and destructors where possible.

---
 include/modules/bs_badwords.h | 6 +++---
 include/modules/bs_kick.h     | 4 ++--
 include/modules/cs_entrymsg.h | 4 ++--
 include/modules/cs_log.h      | 6 +++---
 include/modules/cs_mode.h     | 6 +++---
 include/modules/dns.h         | 2 +-
 include/modules/encryption.h  | 4 ++--
 include/modules/ldap.h        | 4 ++--
 include/modules/ns_cert.h     | 4 ++--
 include/modules/os_forbid.h   | 2 +-
 include/modules/os_ignore.h   | 2 +-
 include/modules/redis.h       | 2 +-
 include/modules/set_misc.h    | 5 +++--
 include/modules/sql.h         | 4 ++--
 include/modules/suspend.h     | 4 ++--
 include/modules/xmlrpc.h      | 2 +-
 16 files changed, 31 insertions(+), 30 deletions(-)

(limited to 'include/modules')

diff --git a/include/modules/bs_badwords.h b/include/modules/bs_badwords.h
index e2361616e..7bb7f1130 100644
--- a/include/modules/bs_badwords.h
+++ b/include/modules/bs_badwords.h
@@ -30,14 +30,14 @@ struct BadWord
 	Anope::string word;
 	BadWordType type;
 
-	virtual ~BadWord() { }
+	virtual ~BadWord() = default;
  protected:
-	BadWord() { }
+	BadWord() = default;
 };
 
 struct BadWords
 {
-	virtual ~BadWords() { }
+	virtual ~BadWords() = default;
 
 	/** Add a badword to the badword list
 	 * @param word The badword
diff --git a/include/modules/bs_kick.h b/include/modules/bs_kick.h
index 1e292b25f..69c5c43ad 100644
--- a/include/modules/bs_kick.h
+++ b/include/modules/bs_kick.h
@@ -36,9 +36,9 @@ struct KickerData
 	bool dontkickops, dontkickvoices;
 
  protected:
-	KickerData() { }
+	KickerData() = default;
 
  public:
-	virtual ~KickerData() { }
+	virtual ~KickerData() = default;
 	virtual void Check(ChannelInfo *ci) = 0;
 };
diff --git a/include/modules/cs_entrymsg.h b/include/modules/cs_entrymsg.h
index 23a40b4c2..5b899ec84 100644
--- a/include/modules/cs_entrymsg.h
+++ b/include/modules/cs_entrymsg.h
@@ -13,9 +13,9 @@ struct EntryMsg
 	Anope::string message;
 	time_t when;
 
-	virtual ~EntryMsg() { }
+	virtual ~EntryMsg() = default;
  protected:
-	EntryMsg() { }
+	EntryMsg() = default;
 };
 
 struct EntryMessageList : Serialize::Checker<std::vector<EntryMsg *> >
diff --git a/include/modules/cs_log.h b/include/modules/cs_log.h
index 0df61d4db..14f9764e3 100644
--- a/include/modules/cs_log.h
+++ b/include/modules/cs_log.h
@@ -22,9 +22,9 @@ struct LogSetting
 	Anope::string creator;
 	time_t created;
 
-	virtual ~LogSetting() { }
+	virtual ~LogSetting() = default;
  protected:
-	LogSetting() { }
+	LogSetting() = default;
 };
 
 struct LogSettings : Serialize::Checker<std::vector<LogSetting *> >
@@ -37,6 +37,6 @@ struct LogSettings : Serialize::Checker<std::vector<LogSetting *> >
 	}
 
  public:
-	virtual ~LogSettings() { }
+	virtual ~LogSettings() = default;
 	virtual LogSetting *Create() = 0;
 };
diff --git a/include/modules/cs_mode.h b/include/modules/cs_mode.h
index fe59f17f9..d99a9a1ff 100644
--- a/include/modules/cs_mode.h
+++ b/include/modules/cs_mode.h
@@ -18,16 +18,16 @@ struct ModeLock
 	Anope::string setter;
 	time_t created;
 
-	virtual ~ModeLock() { }
+	virtual ~ModeLock() = default;
  protected:
-	ModeLock() { }
+	ModeLock() = default;
 };
 
 struct ModeLocks
 {
 	typedef std::vector<ModeLock *> ModeList;
 
-	virtual ~ModeLocks() { }
+	virtual ~ModeLocks() = default;
 
 	/** Check if a mode is mlocked
 	 * @param mode The mode
diff --git a/include/modules/dns.h b/include/modules/dns.h
index afbac2944..6c9eda89f 100644
--- a/include/modules/dns.h
+++ b/include/modules/dns.h
@@ -118,7 +118,7 @@ namespace DNS
 	{
 	 public:
 		Manager(Module *creator) : Service(creator, "DNS::Manager", "dns/manager") { }
-		virtual ~Manager() { }
+		virtual ~Manager() = default;
 
 		virtual void Process(Request *req) = 0;
 		virtual void RemoveRequest(Request *req) = 0;
diff --git a/include/modules/encryption.h b/include/modules/encryption.h
index acb084835..4adc77136 100644
--- a/include/modules/encryption.h
+++ b/include/modules/encryption.h
@@ -17,7 +17,7 @@ namespace Encryption
 	class Context
 	{
 	 public:
-		virtual ~Context() { }
+		virtual ~Context() = default;
 		virtual void Update(const unsigned char *data, size_t len) = 0;
 		virtual void Finalize() = 0;
 		virtual Hash GetFinalizedHash() = 0;
@@ -27,7 +27,7 @@ namespace Encryption
 	{
 	 public:
 		Provider(Module *creator, const Anope::string &sname) : Service(creator, "Encryption::Provider", sname) { }
-		virtual ~Provider() { }
+		virtual ~Provider() = default;
 
 		virtual Context *CreateContext(IV * = NULL) = 0;
 		virtual IV GetDefaultIV() = 0;
diff --git a/include/modules/ldap.h b/include/modules/ldap.h
index 74dad36a3..7b778b6d4 100644
--- a/include/modules/ldap.h
+++ b/include/modules/ldap.h
@@ -14,7 +14,7 @@ class LDAPException : public ModuleException
  public:
 	LDAPException(const Anope::string &reason) : ModuleException(reason) { }
 
-	virtual ~LDAPException() throw() { }
+	virtual ~LDAPException() throw() = default;
 };
 
 struct LDAPModification
@@ -116,7 +116,7 @@ class LDAPInterface
 	Module *owner;
 
 	LDAPInterface(Module *m) : owner(m) { }
-	virtual ~LDAPInterface() { }
+	virtual ~LDAPInterface() = default;
 
 	virtual void OnResult(const LDAPResult &r) = 0;
 	virtual void OnError(const LDAPResult &err) = 0;
diff --git a/include/modules/ns_cert.h b/include/modules/ns_cert.h
index a84276b52..62ac07846 100644
--- a/include/modules/ns_cert.h
+++ b/include/modules/ns_cert.h
@@ -12,9 +12,9 @@
 struct NSCertList
 {
  protected:
-	NSCertList() { }
+	NSCertList() = default;
  public:
-	virtual ~NSCertList() { }
+	virtual ~NSCertList() = default;
 
 	/** Add an entry to the nick's certificate list
 	 *
diff --git a/include/modules/os_forbid.h b/include/modules/os_forbid.h
index 140731593..dd73dca4a 100644
--- a/include/modules/os_forbid.h
+++ b/include/modules/os_forbid.h
@@ -27,7 +27,7 @@ struct ForbidData
 	time_t expires = 0;
 	ForbidType type;
 
-	virtual ~ForbidData() { }
+	virtual ~ForbidData() = default;
  protected:
 	ForbidData() = default;
 };
diff --git a/include/modules/os_ignore.h b/include/modules/os_ignore.h
index 55eb96554..c4e401e81 100644
--- a/include/modules/os_ignore.h
+++ b/include/modules/os_ignore.h
@@ -16,7 +16,7 @@ struct IgnoreData
 	Anope::string reason;
 	time_t time = 0; /* When do we stop ignoring them? */
 
-	virtual ~IgnoreData() { }
+	virtual ~IgnoreData() = default;
  protected:
 	IgnoreData() = default;
 };
diff --git a/include/modules/redis.h b/include/modules/redis.h
index cb6f5380f..4d72b2afa 100644
--- a/include/modules/redis.h
+++ b/include/modules/redis.h
@@ -47,7 +47,7 @@ namespace Redis
 		Module *owner;
 
 		Interface(Module *m) : owner(m) { }
-		virtual ~Interface() { }
+		virtual ~Interface() = default;
 
 		virtual void OnResult(const Reply &r) = 0;
 		virtual void OnError(const Anope::string &error) { Log(owner) << error; }
diff --git a/include/modules/set_misc.h b/include/modules/set_misc.h
index de3d63228..c056c4c98 100644
--- a/include/modules/set_misc.h
+++ b/include/modules/set_misc.h
@@ -12,6 +12,7 @@ struct MiscData
 	Anope::string name;
 	Anope::string data;
 
-	MiscData() { }
-	virtual ~MiscData() { }
+	virtual ~MiscData() = default;
+ protected:
+	MiscData() = default;
 };
diff --git a/include/modules/sql.h b/include/modules/sql.h
index d78f64391..dbb21afcd 100644
--- a/include/modules/sql.h
+++ b/include/modules/sql.h
@@ -82,7 +82,7 @@ namespace SQL
 	 public:
 		Exception(const Anope::string &reason) : ModuleException(reason) { }
 
-		virtual ~Exception() throw() { }
+		virtual ~Exception() throw() = default;
 	};
 
 	/** A SQL query
@@ -187,7 +187,7 @@ namespace SQL
 		Module *owner;
 
 		Interface(Module *m) : owner(m) { }
-		virtual ~Interface() { }
+		virtual ~Interface() = default;
 
 		virtual void OnResult(const Result &r) = 0;
 		virtual void OnError(const Result &r) = 0;
diff --git a/include/modules/suspend.h b/include/modules/suspend.h
index 6b9177da4..b9865717d 100644
--- a/include/modules/suspend.h
+++ b/include/modules/suspend.h
@@ -14,6 +14,6 @@ struct SuspendInfo
 	Anope::string what, by, reason;
 	time_t when, expires;
 
-	SuspendInfo() { }
-	virtual ~SuspendInfo() { }
+	SuspendInfo() = default;
+	virtual ~SuspendInfo() = default;
 };
diff --git a/include/modules/xmlrpc.h b/include/modules/xmlrpc.h
index 42d29bd2d..a39cdf061 100644
--- a/include/modules/xmlrpc.h
+++ b/include/modules/xmlrpc.h
@@ -28,7 +28,7 @@ class XMLRPCServiceInterface;
 class XMLRPCEvent
 {
  public:
-	virtual ~XMLRPCEvent() { }
+	virtual ~XMLRPCEvent() = default;
 	virtual bool Run(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request) = 0;
 };
 
-- 
cgit