Initially attach all modules to all events, and detach them as the events are run if they are not implemented per module

6 files changed, 5 insertions, 20 deletions

diff --git a/modules/database/db_flatfile.cpp b/modules/database/db_flatfile.cpp
index 27b6ce1a2..e7ea2f262 100644
--- a/modules/database/db_flatfile.cpp
+++ b/modules/database/db_flatfile.cpp
@@ -164,8 +164,6 @@ class DBFlatFile : public Module, public Pipe
 	DBFlatFile(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, DATABASE | VENDOR), last_day(0), loaded(false)
 	{
 
-		Implementation i[] = { I_OnLoadDatabase, I_OnSaveDatabase, I_OnSerializeTypeCreate };
-		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
 	void OnNotify() anope_override
diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp
index b901d879a..053a49110 100644
--- a/modules/database/db_old.cpp
+++ b/modules/database/db_old.cpp
@@ -1093,8 +1093,6 @@ class DBOld : public Module
 	DBOld(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, DATABASE | VENDOR)
 	{
 
-		Implementation i[] = { I_OnLoadDatabase, I_OnUplinkSync };
-		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		hashm = Config->GetModule(this)->Get<const Anope::string>("hash");
 
diff --git a/modules/database/db_plain.cpp b/modules/database/db_plain.cpp
index a2c8d4274..1e4586a11 100644
--- a/modules/database/db_plain.cpp
+++ b/modules/database/db_plain.cpp
@@ -380,7 +380,7 @@ static void ReadDatabase(Module *m = NULL)
 		/*if (m)
 			MOD_RESULT = m->OnDatabaseRead(params);
 		else
-			FOREACH_RESULT(I_OnDatabaseRead, OnDatabaseRead(params));
+			FOREACH_RESULT(OnDatabaseRead, MOD_RESULT, (params));
 		if (MOD_RESULT == EVENT_STOP)
 			continue;*/
 		OnDatabaseRead(params);
@@ -587,8 +587,6 @@ class DBPlain : public Module
  public:
 	DBPlain(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, DATABASE | VENDOR)
 	{
-		Implementation i[] = { I_OnReload, I_OnLoadDatabase, I_OnSaveDatabase };
-		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		LastDay = 0;
 	}
@@ -645,9 +643,6 @@ class DBPlain : public Module
 	{
 		ReadDatabase();
 
-		/* No need to ever reload this again, although this should never be trigged again */
-		ModuleManager::Detach(I_OnLoadDatabase, this);
-
 		return EVENT_STOP;
 	}
 
@@ -702,7 +697,7 @@ class DBPlain : public Module
 			}
 			for (unsigned k = 0, end = mi->ignores.size(); k < end; ++k)
 				db_buffer << "MD MIG " << Anope::string(mi->ignores[k]) << endl;
-			//FOREACH_MOD(I_OnDatabaseWriteMetadata, OnDatabaseWriteMetadata(WriteMetadata, nc));
+			//FOREACH_MOD(OnDatabaseWriteMetadata, (WriteMetadata, nc));
 		}
 
 		for (nickalias_map::const_iterator it = NickAliasList->begin(), it_end = NickAliasList->end(); it != it_end; ++it)
@@ -727,7 +722,7 @@ class DBPlain : public Module
 			if (na->HasVhost())
 				db_buffer << "MD VHOST " << na->GetVhostCreator() << " " << na->GetVhostCreated() << " " << na->GetVhostHost() << " :" << na->GetVhostIdent() << endl;
 
-			//FOREACH_MOD(I_OnDatabaseWriteMetadata, OnDatabaseWriteMetadata(WriteMetadata, na));
+			//FOREACH_MOD(OnDatabaseWriteMetadata, (WriteMetadata, na));
 		}
 
 		for (botinfo_map::const_iterator it = BotListByNick->begin(), it_end = BotListByNick->end(); it != it_end; ++it)
@@ -836,7 +831,7 @@ class DBPlain : public Module
 				db_buffer << "MD BI BADWORD " << (ci->GetBadWord(k)->type == BW_ANY ? "ANY " : "") << (ci->GetBadWord(k)->type == BW_SINGLE ? "SINGLE " : "") << (ci->GetBadWord(k)->type == BW_START ? "START " : "") <<
 					(ci->GetBadWord(k)->type == BW_END ? "END " : "") << ":" << ci->GetBadWord(k)->word << endl;
 
-			//FOREACH_MOD(I_OnDatabaseWriteMetadata, OnDatabaseWriteMetadata(WriteMetadata, ci));
+			//FOREACH_MOD(OnDatabaseWriteMetadata, (WriteMetadata, ci));
 		}
 
 		db_buffer << "OS STATS " << MaxUserCount << " " << MaxUserTime << endl;
@@ -858,7 +853,7 @@ class DBPlain : public Module
 				db_buffer << "OS EXCEPTION " << e->mask << " " << e->limit << " " << e->who << " " << e->time << " " << e->expires << " " << e->reason << endl;
 			}
 
-		//FOREACH_MOD(I_OnDatabaseWrite, OnDatabaseWrite(Write));
+		//FOREACH_MOD(OnDatabaseWrite, (Write));
 
 		std::fstream db;
 		db.open(DatabaseFile.c_str(), std::ios_base::out | std::ios_base::trunc);
diff --git a/modules/database/db_redis.cpp b/modules/database/db_redis.cpp
index 122248f95..e78134857 100644
--- a/modules/database/db_redis.cpp
+++ b/modules/database/db_redis.cpp
@@ -132,8 +132,6 @@ class DatabaseRedis : public Module, public Pipe
 	{
 		me = this;
 
-		Implementation i[] = { I_OnReload, I_OnLoadDatabase, I_OnSerializeTypeCreate, I_OnSerializableConstruct, I_OnSerializableDestruct, I_OnSerializableUpdate };
-		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
 	/* Insert or update an object */
diff --git a/modules/database/db_sql.cpp b/modules/database/db_sql.cpp
index bb4d5277b..b575d3fd1 100644
--- a/modules/database/db_sql.cpp
+++ b/modules/database/db_sql.cpp
@@ -92,8 +92,6 @@ class DBSQL : public Module, public Pipe
 	DBSQL(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, DATABASE | VENDOR), sql("", ""), sqlinterface(this), shutting_down(false), loading_databases(false), loaded(false), imported(false)
 	{
 
-		Implementation i[] = { I_OnReload, I_OnShutdown, I_OnRestart, I_OnLoadDatabase, I_OnSerializableConstruct, I_OnSerializableDestruct, I_OnSerializableUpdate, I_OnSerializeTypeCreate };
-		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		if (ModuleManager::FindModule("db_sql_live") != NULL)
 			throw ModuleException("db_sql can not be loaded after db_sql_live");
diff --git a/modules/database/db_sql_live.cpp b/modules/database/db_sql_live.cpp
index 992a15471..02e8a355f 100644
--- a/modules/database/db_sql_live.cpp
+++ b/modules/database/db_sql_live.cpp
@@ -70,8 +70,6 @@ class DBMySQL : public Module, public Pipe
 		this->ro = false;
 		this->init = false;
 
-		Implementation i[] = { I_OnReload, I_OnShutdown, I_OnLoadDatabase, I_OnSerializableConstruct, I_OnSerializableDestruct, I_OnSerializeCheck, I_OnSerializableUpdate };
-		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		if (ModuleManager::FindFirstOf(DATABASE) != this)
 			throw ModuleException("If db_sql_live is loaded it must be the first database module loaded.");