Improve the layout of types that inherit from another type.

7 files changed, 33 insertions, 14 deletions

diff --git a/modules/pseudoclients/botserv.cpp b/modules/pseudoclients/botserv.cpp
index 7c28ff706..fb744f643 100644
--- a/modules/pseudoclients/botserv.cpp
+++ b/modules/pseudoclients/botserv.cpp
@@ -11,7 +11,8 @@
 
 #include "module.h"
 
-class BotServCore : public Module
+class BotServCore
+	: public Module
 {
 	Reference<BotInfo> BotServ;
 	ExtensibleRef<bool> persist, inhabit;
diff --git a/modules/pseudoclients/chanserv.cpp b/modules/pseudoclients/chanserv.cpp
index 414fb9cc0..95826ea7b 100644
--- a/modules/pseudoclients/chanserv.cpp
+++ b/modules/pseudoclients/chanserv.cpp
@@ -19,7 +19,9 @@ inline static Anope::string BotModes()
 	);
 }
 
-class ChanServCore : public Module, public ChanServService
+class ChanServCore
+	: public Module
+	, public ChanServService
 {
 	Reference<BotInfo> ChanServ;
 	std::vector<Anope::string> defaults;
@@ -38,7 +40,8 @@ public:
 		/** A timer used to keep the BotServ bot/ChanServ in the channel
 		 * after kicking the last user in a channel
 		 */
-		class ChanServTimer : public Timer
+		class ChanServTimer
+			: public Timer
 		{
 			Reference<BotInfo> &ChanServ;
 			ExtensibleItem<bool> &inhabit;
diff --git a/modules/pseudoclients/global.cpp b/modules/pseudoclients/global.cpp
index 5ffdf13d9..95359a193 100644
--- a/modules/pseudoclients/global.cpp
+++ b/modules/pseudoclients/global.cpp
@@ -11,7 +11,9 @@
 
 #include "module.h"
 
-class GlobalCore : public Module, public GlobalService
+class GlobalCore
+	: public Module
+	, public GlobalService
 {
 	Reference<BotInfo> Global;
 
diff --git a/modules/pseudoclients/hostserv.cpp b/modules/pseudoclients/hostserv.cpp
index 060c504b7..12af0467b 100644
--- a/modules/pseudoclients/hostserv.cpp
+++ b/modules/pseudoclients/hostserv.cpp
@@ -11,7 +11,8 @@
 
 #include "module.h"
 
-class HostServCore : public Module
+class HostServCore
+	: public Module
 {
 	Reference<BotInfo> HostServ;
 public:
diff --git a/modules/pseudoclients/memoserv.cpp b/modules/pseudoclients/memoserv.cpp
index e3be62c7c..12677dbcf 100644
--- a/modules/pseudoclients/memoserv.cpp
+++ b/modules/pseudoclients/memoserv.cpp
@@ -11,7 +11,9 @@
 
 #include "module.h"
 
-class MemoServCore : public Module, public MemoServService
+class MemoServCore
+	: public Module
+	, public MemoServService
 {
 	Reference<BotInfo> MemoServ;
 
diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp
index c885d5576..9bf11e268 100644
--- a/modules/pseudoclients/nickserv.cpp
+++ b/modules/pseudoclients/nickserv.cpp
@@ -16,7 +16,8 @@ static std::set<NickServCollide *> collides;
 
 /** Timer for colliding nicks to force people off of nicknames
  */
-class NickServCollide : public Timer
+class NickServCollide
+	: public Timer
 {
 	NickServService *service;
 	Reference<User> u;
@@ -58,7 +59,8 @@ public:
 
 /** Timer for removing HELD status from nicks.
  */
-class NickServHeld : public Timer
+class NickServHeld
+	: public Timer
 {
 	Reference<NickAlias> na;
 	Anope::string nick;
@@ -80,7 +82,9 @@ static Anope::map<NickServRelease *> NickServReleases;
 
 /** Timer for releasing nicks to be available for use
  */
-class NickServRelease : public User, public Timer
+class NickServRelease
+	: public User
+	, public Timer
 {
 	Anope::string nick;
 
@@ -110,7 +114,9 @@ public:
 	void Tick(time_t t) override { }
 };
 
-class NickServCore : public Module, public NickServService
+class NickServCore
+	: public Module
+	, public NickServService
 {
 	Reference<BotInfo> NickServ;
 	std::vector<Anope::string> defaults;
diff --git a/modules/pseudoclients/operserv.cpp b/modules/pseudoclients/operserv.cpp
index 9f8e320e0..6e793a599 100644
--- a/modules/pseudoclients/operserv.cpp
+++ b/modules/pseudoclients/operserv.cpp
@@ -11,7 +11,8 @@
 
 #include "module.h"
 
-class SGLineManager : public XLineManager
+class SGLineManager
+	: public XLineManager
 {
 public:
 	SGLineManager(Module *creator) : XLineManager(creator, "xlinemanager/sgline", 'G') { }
@@ -63,7 +64,8 @@ public:
 	}
 };
 
-class SQLineManager : public XLineManager
+class SQLineManager
+	: public XLineManager
 {
 	ServiceReference<NickServService> nickserv;
 
@@ -142,7 +144,8 @@ public:
 	}
 };
 
-class SNLineManager : public XLineManager
+class SNLineManager
+	: public XLineManager
 {
 public:
 	SNLineManager(Module *creator) : XLineManager(creator, "xlinemanager/snline", 'N') { }
@@ -180,7 +183,8 @@ public:
 	}
 };
 
-class OperServCore : public Module
+class OperServCore
+	: public Module
 {
 	Reference<BotInfo> OperServ;
 	SGLineManager sglines;