Fix a bunch of cases where module types were not marked as final.

13 files changed, 26 insertions, 20 deletions

diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index 2015fb725..267356218 100644
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -46,7 +46,8 @@
 class SQLConn;
 typedef insp::flat_map<std::string, SQLConn*> ConnMap;
 
-class SQLite3Result : public SQL::Result
+class SQLite3Result final
+	: public SQL::Result
 {
  public:
 	int currentrow = 0;
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index bbadc7226..2905794f1 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -162,7 +162,7 @@ namespace GnuTLS
 		const gnutls_dh_params_t& get() const { return dh_params; }
 	};
 
-	class X509Key
+	class X509Key final
 	{
 		/** Ensure that the key is deinited in case the constructor of X509Key throws
 		 */
@@ -193,7 +193,7 @@ namespace GnuTLS
 		gnutls_x509_privkey_t& get() { return key.key; }
 	};
 
-	class X509CertList
+	class X509CertList final
 	{
 		std::vector<gnutls_x509_crt_t> certs;
 
@@ -231,7 +231,7 @@ namespace GnuTLS
 		size_t size() const { return certs.size(); }
 	};
 
-	class X509CRL
+	class X509CRL final
 	{
 		class RAIICRL final
 		{
@@ -361,7 +361,8 @@ namespace GnuTLS
 		}
 	};
 
-	class X509Credentials : public CertCredentials
+	class X509Credentials final
+		: public CertCredentials
 	{
 		/** Private key
 		 */
diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp
index 91d67bcb3..61134ad3b 100644
--- a/src/modules/extra/m_ssl_mbedtls.cpp
+++ b/src/modules/extra/m_ssl_mbedtls.cpp
@@ -127,7 +127,8 @@ namespace mbedTLS
 		}
 	};
 
-	class X509Key : public RAIIObj<mbedtls_pk_context, mbedtls_pk_init, mbedtls_pk_free>
+	class X509Key final
+		: public RAIIObj<mbedtls_pk_context, mbedtls_pk_init, mbedtls_pk_free>
 	{
 	 public:
 		/** Import */
@@ -194,7 +195,8 @@ namespace mbedTLS
 		bool empty() const { return (list.size() <= 1); }
 	};
 
-	class X509CertList : public RAIIObj<mbedtls_x509_crt, mbedtls_x509_crt_init, mbedtls_x509_crt_free>
+	class X509CertList final
+		: public RAIIObj<mbedtls_x509_crt, mbedtls_x509_crt_init, mbedtls_x509_crt_free>
 	{
 	 public:
 		/** Import or create empty */
@@ -209,7 +211,8 @@ namespace mbedTLS
 		bool empty() const { return (get()->raw.p != NULL); }
 	};
 
-	class X509CRL : public RAIIObj<mbedtls_x509_crl, mbedtls_x509_crl_init, mbedtls_x509_crl_free>
+	class X509CRL final
+		: public RAIIObj<mbedtls_x509_crl, mbedtls_x509_crl_init, mbedtls_x509_crl_free>
 	{
 	 public:
 		X509CRL(const std::string& crlstr)
@@ -221,7 +224,7 @@ namespace mbedTLS
 		}
 	};
 
-	class X509Credentials
+	class X509Credentials final
 	{
 		/** Private key
 		 */
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 455ddeccd..19d0796a6 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -43,7 +43,7 @@ enum
 	RPL_UMODEGMSG = 718
 };
 
-class callerid_data
+class callerid_data final
 {
  public:
 	typedef insp::flat_set<User*> UserSet;
diff --git a/src/modules/m_ircv3.cpp b/src/modules/m_ircv3.cpp
index 2a2be97d9..4e50ea059 100644
--- a/src/modules/m_ircv3.cpp
+++ b/src/modules/m_ircv3.cpp
@@ -113,7 +113,7 @@ class JoinHook final
 	}
 };
 
-class ModuleIRCv3
+class ModuleIRCv3 final
 	: public Module
 	, public AccountEventListener
 	, public Away::EventListener
diff --git a/src/modules/m_ircv3_batch.cpp b/src/modules/m_ircv3_batch.cpp
index 4914dafba..74ce55098 100644
--- a/src/modules/m_ircv3_batch.cpp
+++ b/src/modules/m_ircv3_batch.cpp
@@ -39,7 +39,7 @@ class BatchMessage final
 /** Extra structure allocated only for running batches, containing objects only relevant for
  * that specific run of the batch.
  */
-struct IRCv3::Batch::BatchInfo
+struct IRCv3::Batch::BatchInfo final
 {
 	/** List of users that have received the batch start message
 	 */
@@ -58,7 +58,8 @@ struct IRCv3::Batch::BatchInfo
 	}
 };
 
-class IRCv3::Batch::ManagerImpl final : public Manager
+class IRCv3::Batch::ManagerImpl final
+	: public Manager
 {
 	typedef std::vector<Batch*> BatchList;
 
diff --git a/src/modules/m_ircv3_ctctags.cpp b/src/modules/m_ircv3_ctctags.cpp
index 859387b2e..ef9692d05 100644
--- a/src/modules/m_ircv3_ctctags.cpp
+++ b/src/modules/m_ircv3_ctctags.cpp
@@ -304,7 +304,7 @@ class C2CTags final
 	}
 };
 
-class ModuleIRCv3CTCTags
+class ModuleIRCv3CTCTags final
 	: public Module
 	, public CTCTags::EventListener
 	, public ISupport::EventListener
diff --git a/src/modules/m_ircv3_echomessage.cpp b/src/modules/m_ircv3_echomessage.cpp
index bf15a84a8..4fd2abc59 100644
--- a/src/modules/m_ircv3_echomessage.cpp
+++ b/src/modules/m_ircv3_echomessage.cpp
@@ -23,7 +23,7 @@
 #include "modules/cap.h"
 #include "modules/ctctags.h"
 
-class ModuleIRCv3EchoMessage
+class ModuleIRCv3EchoMessage final
 	: public Module
 	, public CTCTags::EventListener
 {
diff --git a/src/modules/m_ldapauth.cpp b/src/modules/m_ldapauth.cpp
index b127cb63f..649863175 100644
--- a/src/modules/m_ldapauth.cpp
+++ b/src/modules/m_ldapauth.cpp
@@ -36,7 +36,7 @@ namespace
 	std::vector<std::pair<std::string, std::string> > requiredattributes;
 }
 
-class BindInterface
+class BindInterface final
 	: public LDAPInterface
 {
 	const std::string provider;
diff --git a/src/modules/m_md5.cpp b/src/modules/m_md5.cpp
index ab610bedb..9565067e1 100644
--- a/src/modules/m_md5.cpp
+++ b/src/modules/m_md5.cpp
@@ -42,7 +42,7 @@ typedef unsigned char byte;
 
 /** An MD5 context, used by m_opermd5
  */
-class MD5Context
+class MD5Context final
 {
  public:
 	word32 buf[4];
diff --git a/src/modules/m_monitor.cpp b/src/modules/m_monitor.cpp
index 22377f0a6..ab116e9e2 100644
--- a/src/modules/m_monitor.cpp
+++ b/src/modules/m_monitor.cpp
@@ -51,7 +51,7 @@ struct IRCv3::Monitor::Entry final
 	const std::string& GetNick() const { return nick; }
 };
 
-class IRCv3::Monitor::Manager
+class IRCv3::Monitor::Manager final
 {
 	struct ExtData final
 	{
diff --git a/src/modules/m_pbkdf2.cpp b/src/modules/m_pbkdf2.cpp
index 4823cd9a0..a37da222b 100644
--- a/src/modules/m_pbkdf2.cpp
+++ b/src/modules/m_pbkdf2.cpp
@@ -27,7 +27,7 @@
 // Iterations:B64(Hash):B64(Salt)
 // E.g.
 // 10200:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-class PBKDF2Hash
+class PBKDF2Hash final
 {
  public:
 	unsigned long iterations;
diff --git a/src/modules/m_sha1.cpp b/src/modules/m_sha1.cpp
index e42798a6c..e4c557f5c 100644
--- a/src/modules/m_sha1.cpp
+++ b/src/modules/m_sha1.cpp
@@ -58,7 +58,7 @@ static const uint32_t sha1_iv[5] =
 	0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0
 };
 
-class SHA1Context
+class SHA1Context final
 {
 	uint32_t state[5];
 	uint32_t count[2];