relocate the Move* methods to private: where they belong, rename erase_factory and erase_module to be more appropriate EraseFactory and EraseModule methods

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

2 files changed, 10 insertions, 10 deletions

diff --git a/include/inspircd.h b/include/inspircd.h
index af1d5cd90..11fdb3a54 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -83,14 +83,18 @@ class InspIRCd
 	char MODERR[MAXBUF];
 	bool expire_run;
  
-	void erase_factory(int j);
-	void erase_module(int j);
+	void EraseFactory(int j);
+	void EraseModule(int j);
 	void BuildISupport();
 	void MoveTo(std::string modulename,int slot);
 	void Start();
 	void SetSignals();
 	bool DaemonSeed();
 	void MakeLowerMap();
+	void MoveToLast(std::string modulename);
+	void MoveToFirst(std::string modulename);
+	void MoveAfter(std::string modulename, std::string after);
+	void MoveBefore(std::string modulename, std::string before);
 
  public:
 	time_t startup_time;
@@ -105,10 +109,6 @@ class InspIRCd
 	char* ModuleError();
 	bool LoadModule(const char* filename);
 	bool UnloadModule(const char* filename);
-	void MoveToLast(std::string modulename);
-	void MoveToFirst(std::string modulename);
-	void MoveAfter(std::string modulename, std::string after);
-	void MoveBefore(std::string modulename, std::string before);
 	InspIRCd(int argc, char** argv);
 	void DoOneIteration(bool process_module_sockets);
 	int Run();
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 8176b8332..1a12b7039 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -361,7 +361,7 @@ char* InspIRCd::ModuleError()
 	return MODERR;
 }
 
-void InspIRCd::erase_factory(int j)
+void InspIRCd::EraseFactory(int j)
 {
 	int v = 0;
 	for (std::vector<ircd_module*>::iterator t = factory.begin(); t != factory.end(); t++)
@@ -376,7 +376,7 @@ void InspIRCd::erase_factory(int j)
 	}
 }
 
-void InspIRCd::erase_module(int j)
+void InspIRCd::EraseModule(int j)
 {
 	int v1 = 0;
 	for (std::vector<Module*>::iterator m = modules.begin(); m!= modules.end(); m++)
@@ -537,9 +537,9 @@ bool InspIRCd::UnloadModule(const char* filename)
 
 			// found the module
 			log(DEBUG,"Deleting module...");
-			erase_module(j);
+			this->EraseModule(j);
 			log(DEBUG,"Erasing module entry...");
-			erase_factory(j);
+			this->EraseFactory(j);
 			log(DEBUG,"Removing dependent commands...");
 			Parser->RemoveCommands(filename);
 			log(DEFAULT,"Module %s unloaded",filename);