Moved a bunch of stuff into class InspIRCd

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

2 files changed, 12 insertions, 6 deletions

diff --git a/include/inspircd.h b/include/inspircd.h
index 1eece0532..d3c7db549 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -93,9 +93,17 @@ class serverstats
 
 class InspIRCd
 {
+
+ private:
+        void erase_factory(int j);
+        void erase_module(int j);
+        bool UnloadModule(const char* filename);
+        bool LoadModule(const char* filename);
+
  public:
 	InspIRCd(int argc, char** argv);
 	int Run();
+
 };
 
 /* prototypes */
@@ -109,8 +117,6 @@ int loop_call(handlerfunc fn, char **parameters, int pcnt, userrec *u, int start
 void AddWhoWas(userrec* u);
 void ConnectUser(userrec *user);
 userrec* ReHashNick(char* Old, char* New);
-bool LoadModule(const char* filename);
-bool UnloadModule(const char* filename);
 char* ModuleError();
 /* optimization tricks to save us walking the user hash */
 void AddOper(userrec* user);
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 0e7902f74..baabe90e3 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -1368,7 +1368,7 @@ char* ModuleError()
 	return MODERR;
 }
 
-void erase_factory(int j)
+void InspIRCd::erase_factory(int j)
 {
 	int v = 0;
 	for (std::vector<ircd_module*>::iterator t = factory.begin(); t != factory.end(); t++)
@@ -1383,7 +1383,7 @@ void erase_factory(int j)
      	}
 }
 
-void erase_module(int j)
+void InspIRCd::erase_module(int j)
 {
 	int v1 = 0;
 	for (std::vector<Module*>::iterator m = modules.begin(); m!= modules.end(); m++)
@@ -1410,7 +1410,7 @@ void erase_module(int j)
 
 }
 
-bool UnloadModule(const char* filename)
+bool InspIRCd::UnloadModule(const char* filename)
 {
 	std::string filename_str = filename;
 	for (unsigned int j = 0; j != Config->module_names.size(); j++)
@@ -1450,7 +1450,7 @@ bool UnloadModule(const char* filename)
 	return false;
 }
 
-bool LoadModule(const char* filename)
+bool InspIRCd::LoadModule(const char* filename)
 {
 	char modfile[MAXBUF];
 #ifdef STATIC_LINK