Improve the layout of types that inherit from another type.

103 files changed, 743 insertions, 366 deletions

diff --git a/modules/commands/bs_assign.cpp b/modules/commands/bs_assign.cpp
index ccce7571a..e1e744842 100644
--- a/modules/commands/bs_assign.cpp
+++ b/modules/commands/bs_assign.cpp
@@ -11,7 +11,8 @@
 
 #include "module.h"
 
-class CommandBSAssign : public Command
+class CommandBSAssign
+	: public Command
 {
 public:
 	CommandBSAssign(Module *creator) : Command(creator, "botserv/assign", 2, 2)
@@ -82,7 +83,8 @@ public:
 	}
 };
 
-class CommandBSUnassign : public Command
+class CommandBSUnassign
+	: public Command
 {
 public:
 	CommandBSUnassign(Module *creator) : Command(creator, "botserv/unassign", 1, 1)
@@ -145,7 +147,8 @@ public:
 	}
 };
 
-class CommandBSSetNoBot : public Command
+class CommandBSSetNoBot
+	: public Command
 {
 public:
 	CommandBSSetNoBot(Module *creator, const Anope::string &sname = "botserv/set/nobot") : Command(creator, sname, 2, 2)
@@ -202,7 +205,8 @@ public:
 	}
 };
 
-class BSAssign : public Module
+class BSAssign
+	: public Module
 {
 	ExtensibleItem<bool> nobot;
 
diff --git a/modules/commands/bs_badwords.cpp b/modules/commands/bs_badwords.cpp
index 82e4e20b3..cf863e442 100644
--- a/modules/commands/bs_badwords.cpp
+++ b/modules/commands/bs_badwords.cpp
@@ -12,7 +12,9 @@
 #include "module.h"
 #include "modules/bs_badwords.h"
 
-struct BadWordImpl : BadWord, Serializable
+struct BadWordImpl
+	: BadWord
+	, Serializable
 {
 	BadWordImpl() : Serializable("BadWord") { }
 	~BadWordImpl() override;
@@ -27,7 +29,8 @@ struct BadWordImpl : BadWord, Serializable
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
 };
 
-struct BadWordsImpl : BadWords
+struct BadWordsImpl
+	: BadWords
 {
 	Serialize::Reference<ChannelInfo> ci;
 	typedef std::vector<BadWordImpl *> list;
@@ -144,7 +147,8 @@ Serializable* BadWordImpl::Unserialize(Serializable *obj, Serialize::Data &data)
 	return bw;
 }
 
-class BadwordsDelCallback : public NumberList
+class BadwordsDelCallback
+	: public NumberList
 {
 	CommandSource &source;
 	ChannelInfo *ci;
@@ -181,7 +185,8 @@ public:
 	}
 };
 
-class CommandBSBadwords : public Command
+class CommandBSBadwords
+	: public Command
 {
 private:
 	void DoList(CommandSource &source, ChannelInfo *ci, const Anope::string &word)
@@ -200,7 +205,8 @@ private:
 		}
 		else if (!word.empty() && word.find_first_not_of("1234567890,-") == Anope::string::npos)
 		{
-			class BadwordsListCallback : public NumberList
+			class BadwordsListCallback
+				: public NumberList
 			{
 				ListFormatter &list;
 				BadWords *bw;
@@ -453,7 +459,8 @@ public:
 	}
 };
 
-class BSBadwords : public Module
+class BSBadwords
+	: public Module
 {
 	CommandBSBadwords commandbsbadwords;
 	ExtensibleItem<BadWordsImpl> badwords;
diff --git a/modules/commands/bs_bot.cpp b/modules/commands/bs_bot.cpp
index 6499e3baa..e882d3e04 100644
--- a/modules/commands/bs_bot.cpp
+++ b/modules/commands/bs_bot.cpp
@@ -11,7 +11,8 @@
 
 #include "module.h"
 
-class CommandBSBot : public Command
+class CommandBSBot
+	: public Command
 {
 private:
 	void DoAdd(CommandSource &source, const std::vector<Anope::string> &params)
@@ -370,7 +371,8 @@ public:
 	}
 };
 
-class BSBot : public Module
+class BSBot
+	: public Module
 {
 	CommandBSBot commandbsbot;
 
diff --git a/modules/commands/bs_botlist.cpp b/modules/commands/bs_botlist.cpp
index a62cfe174..828b5af99 100644
--- a/modules/commands/bs_botlist.cpp
+++ b/modules/commands/bs_botlist.cpp
@@ -11,7 +11,8 @@
 
 #include "module.h"
 
-class CommandBSBotList : public Command
+class CommandBSBotList
+	: public Command
 {
 public:
 	CommandBSBotList(Module *creator) : Command(creator, "botserv/botlist", 0, 0)
@@ -65,7 +66,8 @@ public:
 	}
 };
 
-class BSBotList : public Module
+class BSBotList
+	: public Module
 {
 	CommandBSBotList commandbsbotlist;
 
diff --git a/modules/commands/bs_control.cpp b/modules/commands/bs_control.cpp
index 1c7f0ddb4..1230f03e1 100644
--- a/modules/commands/bs_control.cpp
+++ b/modules/commands/bs_control.cpp
@@ -11,7 +11,8 @@
 
 #include "module.h"
 
-class CommandBSSay : public Command
+class CommandBSSay
+	: public Command
 {
 public:
 	CommandBSSay(Module *creator) : Command(creator, "botserv/say", 2, 2)
@@ -71,7 +72,8 @@ public:
 	}
 };
 
-class CommandBSAct : public Command
+class CommandBSAct
+	: public Command
 {
 public:
 	CommandBSAct(Module *creator) : Command(creator, "botserv/act", 2, 2)
@@ -130,7 +132,8 @@ public:
 	}
 };
 
-class BSControl : public Module
+class BSControl
+	: public Module
 {
 	CommandBSSay commandbssay;
 	CommandBSAct commandbsact;
diff --git a/modules/commands/bs_info.cpp b/modules/commands/bs_info.cpp
index 4c2b1d4e9..f8381836d 100644
--- a/modules/commands/bs_info.cpp
+++ b/modules/commands/bs_info.cpp
@@ -11,7 +11,8 @@
 
 #include "module.h"
 
-class CommandBSInfo : public Command
+class CommandBSInfo
+	: public Command
 {
 private:
 	void send_bot_channels(std::vector<Anope::string> &buffers, const BotInfo *bi)
@@ -117,7 +118,8 @@ public:
 	}
 };
 
-class BSInfo : public Module
+class BSInfo
+	: public Module
 {
 	CommandBSInfo commandbsinfo;
 
diff --git a/modules/commands/bs_kick.cpp b/modules/commands/bs_kick.cpp
index e1919e241..e02c6cab8 100644
--- a/modules/commands/bs_kick.cpp
+++ b/modules/commands/bs_kick.cpp
@@ -15,7 +15,8 @@
 
 static Module *me;
 
-struct KickerDataImpl : KickerData
+struct KickerDataImpl
+	: KickerData
 {
 	KickerDataImpl(Extensible *obj)
 	{
@@ -37,7 +38,8 @@ struct KickerDataImpl : KickerData
 		ci->Shrink<KickerData>("kickerdata");
 	}
 
-	struct ExtensibleItem : ::ExtensibleItem<KickerDataImpl>
+	struct ExtensibleItem
+		: ::ExtensibleItem<KickerDataImpl>
 	{
 		ExtensibleItem(Module *m, const Anope::string &ename) : ::ExtensibleItem<KickerDataImpl>(m, ename) { }
 
@@ -115,7 +117,8 @@ struct KickerDataImpl : KickerData
 	};
 };
 
-class CommandBSKick : public Command
+class CommandBSKick
+	: public Command
 {
 public:
 	CommandBSKick(Module *creator) : Command(creator, "botserv/kick", 0)
@@ -159,7 +162,8 @@ public:
 	}
 };
 
-class CommandBSKickBase : public Command
+class CommandBSKickBase
+	: public Command
 {
 public:
 	CommandBSKickBase(Module *creator, const Anope::string &cname, int minarg, int maxarg) : Command(creator, cname, minarg, maxarg)
@@ -244,7 +248,8 @@ protected:
 	}
 };
 
-class CommandBSKickAMSG : public CommandBSKickBase
+class CommandBSKickAMSG
+	: public CommandBSKickBase
 {
 public:
 	CommandBSKickAMSG(Module *creator) : CommandBSKickBase(creator, "botserv/kick/amsg", 2, 3)
@@ -280,7 +285,8 @@ public:
 	}
 };
 
-class CommandBSKickBadwords : public CommandBSKickBase
+class CommandBSKickBadwords
+	: public CommandBSKickBase
 {
 public:
 	CommandBSKickBadwords(Module *creator) : CommandBSKickBase(creator, "botserv/kick/badwords", 2, 3)
@@ -319,7 +325,8 @@ public:
 	}
 };
 
-class CommandBSKickBolds : public CommandBSKickBase
+class CommandBSKickBolds
+	: public CommandBSKickBase
 {
 public:
 	CommandBSKickBolds(Module *creator) : CommandBSKickBase(creator, "botserv/kick/bolds", 2, 3)
@@ -353,7 +360,8 @@ public:
 	}
 };