From a6a0f6c44780c839b2269f4f29a26ecfdbd95544 Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Tue, 23 Jan 2024 15:28:23 +0000
Subject: Improve the layout of types that inherit from another type.

---
 modules/database/db_flatfile.cpp | 10 +++++++---
 modules/database/db_old.cpp      |  3 ++-
 modules/database/db_redis.cpp    | 28 +++++++++++++++++++---------
 modules/database/db_sql.cpp      | 10 +++++++---
 modules/database/db_sql_live.cpp |  4 +++-
 5 files changed, 38 insertions(+), 17 deletions(-)

(limited to 'modules/database')

diff --git a/modules/database/db_flatfile.cpp b/modules/database/db_flatfile.cpp
index 6e53d0274..b0f766e95 100644
--- a/modules/database/db_flatfile.cpp
+++ b/modules/database/db_flatfile.cpp
@@ -15,7 +15,8 @@
 #include <sys/wait.h>
 #endif
 
-class SaveData : public Serialize::Data
+class SaveData
+	: public Serialize::Data
 {
 public:
 	Anope::string last;
@@ -33,7 +34,8 @@ public:
 	}
 };
 
-class LoadData : public Serialize::Data
+class LoadData
+	: public Serialize::Data
 {
 public:
 	std::fstream *fs = nullptr;
@@ -99,7 +101,9 @@ public:
 	}
 };
 
-class DBFlatFile : public Module, public Pipe
+class DBFlatFile
+	: public Module
+	, public Pipe
 {
 	/* Day the last backup was on */
 	int last_day = 0;
diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp
index fb8d57fbb..eca898b59 100644
--- a/modules/database/db_old.cpp
+++ b/modules/database/db_old.cpp
@@ -1297,7 +1297,8 @@ static void LoadNews()
 	close_db(f);
 }
 
-class DBOld : public Module
+class DBOld
+	: public Module
 {
 	PrimitiveExtensibleItem<uint32_t> mlock_on, mlock_off, mlock_limit;
 	PrimitiveExtensibleItem<Anope::string> mlock_key;
diff --git a/modules/database/db_redis.cpp b/modules/database/db_redis.cpp
index 54080c60b..392108849 100644
--- a/modules/database/db_redis.cpp
+++ b/modules/database/db_redis.cpp
@@ -14,7 +14,8 @@ using namespace Redis;
 class DatabaseRedis;
 static DatabaseRedis *me;
 
-class Data : public Serialize::Data
+class Data
+	: public Serialize::Data
 {
 public:
 	std::map<Anope::string, std::stringstream *> data;
@@ -51,7 +52,8 @@ public:
 	}
 };
 
-class TypeLoader : public Interface
+class TypeLoader
+	: public Interface
 {
 	Anope::string type;
 public:
@@ -60,7 +62,8 @@ public:
 	void OnResult(const Reply &r) override;
 };
 
-class ObjectLoader : public Interface
+class ObjectLoader
+	: public Interface
 {
 	Anope::string type;
 	int64_t id;
@@ -71,7 +74,8 @@ public:
 	void OnResult(const Reply &r) override;
 };
 
-class IDInterface : public Interface
+class IDInterface
+	: public Interface
 {
 	Reference<Serializable> o;
 public:
@@ -80,7 +84,8 @@ public:
 	void OnResult(const Reply &r) override;
 };
 
-class Deleter : public Interface
+class Deleter
+	: public Interface
 {
 	Anope::string type;
 	int64_t id;
@@ -90,7 +95,8 @@ public:
 	void OnResult(const Reply &r) override;
 };
 
-class Updater : public Interface
+class Updater
+	: public Interface
 {
 	Anope::string type;
 	int64_t id;
@@ -100,7 +106,8 @@ public:
 	void OnResult(const Reply &r) override;
 };
 
-class ModifiedObject : public Interface
+class ModifiedObject
+	: public Interface
 {
 	Anope::string type;
 	int64_t id;
@@ -110,7 +117,8 @@ public:
 	void OnResult(const Reply &r) override;
 };
 
-class SubscriptionListener : public Interface
+class SubscriptionListener
+	: public Interface
 {
 public:
 	SubscriptionListener(Module *creator) : Interface(creator) { }
@@ -118,7 +126,9 @@ public:
 	void OnResult(const Reply &r) override;
 };
 
-class DatabaseRedis : public Module, public Pipe
+class DatabaseRedis
+	: public Module
+	, public Pipe
 {
 	SubscriptionListener sl;
 	std::set<Serializable *> updated_items;
diff --git a/modules/database/db_sql.cpp b/modules/database/db_sql.cpp
index 0ebbb26bd..c352a3be2 100644
--- a/modules/database/db_sql.cpp
+++ b/modules/database/db_sql.cpp
@@ -14,7 +14,8 @@
 
 using namespace SQL;
 
-class SQLSQLInterface : public Interface
+class SQLSQLInterface
+	: public Interface
 {
 public:
 	SQLSQLInterface(Module *o) : Interface(o) { }
@@ -33,7 +34,8 @@ public:
 	}
 };
 
-class ResultSQLSQLInterface : public SQLSQLInterface
+class ResultSQLSQLInterface
+	: public SQLSQLInterface
 {
 	Reference<Serializable> obj;
 
@@ -55,7 +57,9 @@ public:
 	}
 };
 
-class DBSQL : public Module, public Pipe
+class DBSQL
+	: public Module
+	, public Pipe
 {
 	ServiceReference<Provider> sql;
 	SQLSQLInterface sqlinterface;
diff --git a/modules/database/db_sql_live.cpp b/modules/database/db_sql_live.cpp
index cc7068c58..0e47eab27 100644
--- a/modules/database/db_sql_live.cpp
+++ b/modules/database/db_sql_live.cpp
@@ -11,7 +11,9 @@
 
 using namespace SQL;
 
-class DBMySQL : public Module, public Pipe
+class DBMySQL
+	: public Module
+	, public Pipe
 {
 private:
 	Anope::string prefix;
-- 
cgit