Move everything module-related out of InspIRCd and into ModuleManager, there is a ModuleManager instantiated as InspIRCd::Modules. Several of the function names have changed slightly as well. e.g. Instance->FindModule(m_foobar.so); is now Instance->Modules->Find(m_foobar.so);

All modules in the core distribution should also be updated in line with these changes.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7985 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 4 insertions, 5 deletions

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 3b3396f5c..3767fbda9 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -936,7 +936,7 @@ void ServerConfig::Read(bool bail, userrec* user)
 		{
 			for (std::vector<std::string>::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++)
 			{
-				if (ServerInstance->UnloadModule(removing->c_str()))
+				if (ServerInstance->Modules->Unload(removing->c_str()))
 				{
 					ServerInstance->WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str());
 
@@ -948,7 +948,7 @@ void ServerConfig::Read(bool bail, userrec* user)
 				else
 				{
 					if (user)
-						user->WriteServ("972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->ModuleError());
+						user->WriteServ("972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->Modules->LastError());
 				}
 			}
 		}
@@ -957,7 +957,7 @@ void ServerConfig::Read(bool bail, userrec* user)
 		{
 			for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
 			{
-				if (ServerInstance->LoadModule(adding->c_str()))
+				if (ServerInstance->Modules->Load(adding->c_str()))
 				{
 					ServerInstance->WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str());
 
@@ -969,7 +969,7 @@ void ServerConfig::Read(bool bail, userrec* user)
 				else
 				{
 					if (user)
-						user->WriteServ("974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->ModuleError());
+						user->WriteServ("974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->Modules->LastError());
 				}
 			}
 		}
@@ -1777,4 +1777,3 @@ bool ValueItem::GetBool()
 {
 	return (GetInteger() || v == "yes" || v == "true");
 }
-