Moved more command parsing stuff to CommandParser

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

2 files changed, 10 insertions, 3 deletions

diff --git a/include/command_parse.h b/include/command_parse.h
index 80d39af64..b199123ee 100644
--- a/include/command_parse.h
+++ b/include/command_parse.h
@@ -21,16 +21,25 @@
 #include <iostream>
 #include <string>
 #include "users.h"
+#include "ctables.h"
+#include "typedefs.h"
  
 class CommandParser
 {
+ private:
+	int CommandParser::ProcessParameters(char **command_p,char *parameters);
+	void CommandParser::ProcessCommand(userrec *user, char* cmd);
+	void SetupCommandTable();
  public:
+	command_table cmdlist;
+
+	CommandParser();
 	void CallHandler(std::string &commandname,char **parameters, int pcnt, userrec *user);
 	bool IsValidCommand(std::string &commandname, int pcnt, userrec * user);
 	int LoopCall(handlerfunc fn, char **parameters, int pcnt, userrec *u, int start, int end, int joins);
 	void ProcessBuffer(const char* cmdbuf,userrec *user);
 	bool RemoveCommands(const char* source);
-	void CommandParser::ProcessCommand(userrec *user, char* cmd);
+	bool CreateCommand(char* cmd, handlerfunc f, char flags, int minparams,char* source);
 };
 
 #endif
diff --git a/include/helperfuncs.h b/include/helperfuncs.h
index 8b0c06600..6b804c8c7 100644
--- a/include/helperfuncs.h
+++ b/include/helperfuncs.h
@@ -68,8 +68,6 @@ long local_count();
 void ShowMOTD(userrec *user);
 void ShowRULES(userrec *user);
 bool AllModulesReportReady(userrec* user);
-void createcommand(char* cmd, handlerfunc f, char flags, int minparams,char* source);
-void SetupCommandTable(void);
 bool DirValid(char* dirandfile);
 std::string GetFullProgDir(char** argv, int argc);