Improve the layout of types that inherit from another type.

20 files changed, 64 insertions, 30 deletions

diff --git a/include/modules/cs_entrymsg.h b/include/modules/cs_entrymsg.h
index 95f571f43..8259adf49 100644
--- a/include/modules/cs_entrymsg.h
+++ b/include/modules/cs_entrymsg.h
@@ -20,7 +20,8 @@ protected:
 	EntryMsg() = default;
 };
 
-struct EntryMessageList : Serialize::Checker<std::vector<EntryMsg *> >
+struct EntryMessageList
+	: Serialize::Checker<std::vector<EntryMsg *> >
 {
 protected:
 	EntryMessageList() : Serialize::Checker<std::vector<EntryMsg *> >("EntryMsg") { }
diff --git a/include/modules/cs_log.h b/include/modules/cs_log.h
index 12bc3fcaf..077ee70ed 100644
--- a/include/modules/cs_log.h
+++ b/include/modules/cs_log.h
@@ -29,7 +29,8 @@ protected:
 	LogSetting() = default;
 };
 
-struct LogSettings : Serialize::Checker<std::vector<LogSetting *> >
+struct LogSettings
+	: Serialize::Checker<std::vector<LogSetting *> >
 {
 	typedef std::vector<LogSetting *>::iterator iterator;
 
diff --git a/include/modules/dns.h b/include/modules/dns.h
index a1e5eb71f..25123a504 100644
--- a/include/modules/dns.h
+++ b/include/modules/dns.h
@@ -88,7 +88,8 @@ namespace DNS
 		};
 	};
 
-	struct ResourceRecord : Question
+	struct ResourceRecord
+		: Question
 	{
 		unsigned int ttl = 0;
 		Anope::string rdata;
@@ -113,7 +114,8 @@ namespace DNS
 
 	/** DNS manager
 	 */
-	class Manager : public Service
+	class Manager
+		: public Service
 	{
 	public:
 		Manager(Module *creator) : Service(creator, "DNS::Manager", "dns/manager") { }
@@ -131,7 +133,9 @@ namespace DNS
 
 	/** A DNS query.
 	 */
-	class Request : public Timer, public Question
+	class Request
+		: public Timer
+		, public Question
 	{
 		Manager *manager;
 	public:
diff --git a/include/modules/encryption.h b/include/modules/encryption.h
index 92385d94a..39eab638b 100644
--- a/include/modules/encryption.h
+++ b/include/modules/encryption.h
@@ -25,7 +25,8 @@ namespace Encryption
 		virtual Hash GetFinalizedHash() = 0;
 	};
 
-	class Provider : public Service
+	class Provider
+		: public Service
 	{
 	public:
 		Provider(Module *creator, const Anope::string &sname) : Service(creator, "Encryption::Provider", sname) { }
diff --git a/include/modules/httpd.h b/include/modules/httpd.h
index 430336236..c755e9dd2 100644
--- a/include/modules/httpd.h
+++ b/include/modules/httpd.h
@@ -93,7 +93,8 @@ struct HTTPMessage
 class HTTPClient;
 class HTTPProvider;
 
-class HTTPPage : public virtual Base
+class HTTPPage
+	: public virtual Base
 {
 	Anope::string url;
 	Anope::string content_type;
@@ -115,7 +116,10 @@ public:
 	virtual bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &) = 0;
 };
 
-class HTTPClient : public ClientSocket, public BinarySocket, public Base
+class HTTPClient
+	: public ClientSocket
+	, public BinarySocket
+	, public Base
 {
 protected:
 	void WriteClient(const Anope::string &message)
@@ -135,7 +139,9 @@ public:
 	virtual void SendReply(HTTPReply *) = 0;
 };
 
-class HTTPProvider : public ListenSocket, public Service
+class HTTPProvider
+	: public ListenSocket
+	, public Service
 {
 	Anope::string ip;
 	unsigned short port;
diff --git a/include/modules/ldap.h b/include/modules/ldap.h
index 166e85fe9..37087198d 100644
--- a/include/modules/ldap.h
+++ b/include/modules/ldap.h
@@ -31,7 +31,8 @@ struct LDAPModification
 };
 typedef std::vector<LDAPModification> LDAPMods;
 
-struct LDAPAttributes : public std::map<Anope::string, std::vector<Anope::string> >
+struct LDAPAttributes
+	: public std::map<Anope::string, std::vector<Anope::string>>
 {
 	size_t size(const Anope::string &attr) const
 	{
@@ -122,7 +123,8 @@ public:
 	virtual void OnDelete() { }
 };
 
-class LDAPProvider : public Service
+class LDAPProvider
+	: public Service
 {
 public:
 	LDAPProvider(Module *c, const Anope::string &n) : Service(c, "LDAPProvider", n) { }
diff --git a/include/modules/ns_cert.h b/include/modules/ns_cert.h
index 09857ffd5..2d24cfeae 100644
--- a/include/modules/ns_cert.h
+++ b/include/modules/ns_cert.h
@@ -63,7 +63,8 @@ public:
 	virtual void Check() = 0;
 };
 
-class CertService : public Service
+class CertService
+	: public Service
 {
 public:
 	CertService(Module *c) : Service(c, "CertService", "certs") { }
diff --git a/include/modules/os_forbid.h b/include/modules/os_forbid.h
index 12eeedbf9..19b34a1e6 100644
--- a/include/modules/os_forbid.h
+++ b/include/modules/os_forbid.h
@@ -31,7 +31,8 @@ protected:
 	ForbidData() = default;
 };
 
-class ForbidService : public Service
+class ForbidService
+	: public Service
 {
 public:
 	ForbidService(Module *m) : Service(m, "ForbidService", "forbid") { }
diff --git a/include/modules/os_ignore.h b/include/modules/os_ignore.h
index 1cd24b670..448fa4354 100644
--- a/include/modules/os_ignore.h
+++ b/include/modules/os_ignore.h
@@ -23,7 +23,8 @@ protected:
 	IgnoreData() = default;
 };
 
-class IgnoreService : public Service
+class IgnoreService
+	: public Service
 {
 protected:
 	IgnoreService(Module *c) : Service(c, "IgnoreService", "ignore") { }
diff --git a/include/modules/os_news.h b/include/modules/os_news.h
index 6a7732269..af7619e56 100644
--- a/include/modules/os_news.h
+++ b/include/modules/os_news.h
@@ -22,7 +22,8 @@ struct NewsMessages
 	const char *msgs[10];
 };
 
-struct NewsItem : Serializable
+struct NewsItem
+	: Serializable
 {
 	NewsType type;
 	Anope::string text;
@@ -32,7 +33,8 @@ struct NewsItem : Serializable
 	NewsItem() : Serializable("NewsItem") { }
 };
 
-class NewsService : public Service
+class NewsService
+	: public Service
 {
 public:
 	NewsService(Module *m) : Service(m, "NewsService", "news") { }
diff --git a/include/modules/os_session.h b/include/modules/os_session.h
index f72e6b8b2..5341b4fe0 100644
--- a/include/modules/os_session.h
+++ b/include/modules/os_session.h
@@ -17,7 +17,8 @@ struct Session
 	Session(const sockaddrs &ip, int len) : addr(ip, len) { }
 };
 
-struct Exception : Serializable
+struct Exception
+	: Serializable
 {
 	Anope::string mask;		/* Hosts to which this exception applies */
 	unsigned limit;			/* Session limit for exception */
@@ -31,7 +32,8 @@ struct Exception : Serializable
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &data);
 };
 
-class SessionService : public Service
+class SessionService
+	: public Service
 {
 public:
 	typedef std::unordered_map<cidr, Session *, cidr::hash> SessionMap;
diff --git a/include/modules/pseudoclients/chanserv.h b/include/modules/pseudoclients/chanserv.h
index baf5cafce..c9e11185c 100644
--- a/include/modules/pseudoclients/chanserv.h
+++ b/include/modules/pseudoclients/chanserv.h
@@ -8,7 +8,8 @@
 
 #pragma once
 
-class ChanServService : public Service
+class ChanServService
+	: public Service
 {
 public:
 	ChanServService(Module *m) : Service(m, "ChanServService", "ChanServ")
diff --git a/include/modules/pseudoclients/global.h b/include/modules/pseudoclients/global.h
index e0b138e8e..73283605d 100644
--- a/include/modules/pseudoclients/global.h
+++ b/include/modules/pseudoclients/global.h
@@ -8,7 +8,8 @@
 
 #pragma once
 
-class GlobalService : public Service
+class GlobalService
+	: public Service
 {
 public:
 	GlobalService(Module *m) : Service(m, "GlobalService", "Global")
diff --git a/include/modules/pseudoclients/memoserv.h b/include/modules/pseudoclients/memoserv.h
index 8529c775e..845a19f00 100644
--- a/include/modules/pseudoclients/memoserv.h
+++ b/include/modules/pseudoclients/memoserv.h
@@ -8,7 +8,8 @@
 
 #pragma once
 
-class MemoServService : public Service
+class MemoServService
+	: public Service
 {
 public:
 	enum MemoResult
diff --git a/include/modules/pseudoclients/nickserv.h b/include/modules/pseudoclients/nickserv.h
index a4f2a89b2..58cf93bd9 100644
--- a/include/modules/pseudoclients/nickserv.h
+++ b/include/modules/pseudoclients/nickserv.h
@@ -8,7 +8,8 @@
 
 #pragma once
 
-class NickServService : public Service
+class NickServService
+	: public Service
 {
 public:
 	NickServService(Module *m) : Service(m, "NickServService", "NickServ")
diff --git a/include/modules/redis.h b/include/modules/redis.h
index 0007922a2..ec990823e 100644
--- a/include/modules/redis.h
+++ b/include/modules/redis.h
@@ -55,7 +55,8 @@ namespace Redis
 		virtual void OnError(const Anope::string &error) { Log(owner) << error; }
 	};
 
-	class Provider : public Service
+	class Provider
+		: public Service
 	{
 	public:
 		Provider(Module *c, const Anope::string &n) : Service(c, "Redis::Provider", n) { }
diff --git a/include/modules/sasl.h b/include/modules/sasl.h
index 64994a7f8..2b1c6a30d 100644
--- a/include/modules/sasl.h
+++ b/include/modules/sasl.h
@@ -22,7 +22,8 @@ namespace SASL
 	class Mechanism;
 	struct Session;
 
-	class Service : public ::Service
+	class Service
+		: public ::Service
 	{
 	public:
 		Service(Module *o) : ::Service(o, "SASL::Service", "sasl") { }
@@ -60,7 +61,8 @@ namespace SASL
 	};
 
 	/* PLAIN, EXTERNAL, etc */
-	class Mechanism : public ::Service
+	class Mechanism
+		: public ::Service
 	{
 	public:
 		Mechanism(Module *o, const Anope::string &sname) : Service(o, "SASL::Mechanism", sname) { }
@@ -76,7 +78,8 @@ namespace SASL
 		}
 	};
 
-	class IdentifyRequest : public ::IdentifyRequest
+	class IdentifyRequest
+		: public ::IdentifyRequest
 	{
 		Anope::string uid;
 		Anope::string hostname, ip;
diff --git a/include/modules/sql.h b/include/modules/sql.h
index 0f2abc812..59cc7a24b 100644
--- a/include/modules/sql.h
+++ b/include/modules/sql.h
@@ -11,7 +11,8 @@
 namespace SQL
 {
 
-	class Data : public Serialize::Data
+	class Data
+		: public Serialize::Data
 	{
 	public:
 		typedef std::map<Anope::string, std::stringstream *> Map;
@@ -199,7 +200,8 @@ namespace SQL
 
 	/** Class providing the SQL service, modules call this to execute queries
 	 */
-	class Provider : public Service
+	class Provider
+		: public Service
 	{
 	public:
 		Provider(Module *c, const Anope::string &n) : Service(c, "SQL::Provider", n) { }
diff --git a/include/modules/ssl.h b/include/modules/ssl.h
index c56212f03..32bcdb73a 100644
--- a/include/modules/ssl.h
+++ b/include/modules/ssl.h
@@ -8,7 +8,8 @@
 
 #pragma once
 
-class SSLService : public Service
+class SSLService
+	: public Service
 {
 public:
 	SSLService(Module *o, const Anope::string &n) : Service(o, "SSLService", n) { }
diff --git a/include/modules/xmlrpc.h b/include/modules/xmlrpc.h
index e57f00004..a12a23c9e 100644
--- a/include/modules/xmlrpc.h
+++ b/include/modules/xmlrpc.h
@@ -34,7 +34,8 @@ public:
 	virtual bool Run(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request) = 0;
 };
 
-class XMLRPCServiceInterface : public Service
+class XMLRPCServiceInterface
+	: public Service
 {
 public:
 	XMLRPCServiceInterface(Module *creator, const Anope::string &sname) : Service(creator, "XMLRPCServiceInterface", sname) { }