we typedeffed nspace::hash_map<std::string,command_t*> to command_table ages ago.

Now its time we used it! command_table::iterator is far neater than nspace::hash_map<std::string,command_t*>::iterator

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

diff --git a/src/cmd_commands.cpp b/src/cmd_commands.cpp
index e4efdaceadaf0a4add6ad2337ec69a1fd7b56875..848070e40593134c31bdd0f8ca71abd404f2f8f0 100644 (file)
--- a/src/cmd_commands.cpp
+++ b/src/cmd_commands.cpp
@@ -24,7 +24,7 @@ extern "C" command_t* init_command(InspIRCd* Instance)
 
 CmdResult cmd_commands::Handle (const char** parameters, int pcnt, userrec *user)
 {
-       for (nspace::hash_map<std::string,command_t*>::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
+       for (command_table::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
        {
                user->WriteServ("902 %s :%s %s %d",user->nick,i->second->command.c_str(),i->second->source.c_str(),i->second->min_params);
        }

diff --git a/src/cmd_stats.cpp b/src/cmd_stats.cpp
index 5e92523819c1ed00a043539f42517b8003e18a36..a23dc250e1d06b1917029295454b9f1952500d7c 100644 (file)
--- a/src/cmd_stats.cpp
+++ b/src/cmd_stats.cpp
@@ -157,7 +157,7 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
 
                /* stats m (list number of times each command has been used, plus bytecount) */
                case 'm':
-                       for (nspace::hash_map<std::string,command_t*>::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
+                       for (command_table::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
                        {
                                if (i->second->use_count)
                                {

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 0fa7c05b2783efefe9d9e6a2ebc3c5d19909ff42..6fdf1800c7d34f04d5b3f59a53f38c7b4d12dc96 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -224,7 +224,7 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p
 
 bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, userrec * user)
 {
-       nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+       command_table::iterator n = cmdlist.find(commandname);
 
        if (n != cmdlist.end())
        {
@@ -245,7 +245,7 @@ bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, use
 
 command_t* CommandParser::GetHandler(const std::string &commandname)
 {
-       nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+       command_table::iterator n = cmdlist.find(commandname);
        if (n != cmdlist.end())
                return n->second;
 
@@ -256,7 +256,7 @@ command_t* CommandParser::GetHandler(const std::string &commandname)
 
 CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user)
 {
-       nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+       command_table::iterator n = cmdlist.find(commandname);
 
        if (n != cmdlist.end())
        {
@@ -311,7 +311,7 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
                return;
        }
 
-       nspace::hash_map<std::string,command_t*>::iterator cm = cmdlist.find(command);
+       command_table::iterator cm = cmdlist.find(command);
        
        if (cm != cmdlist.end())
        {
@@ -383,7 +383,7 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
 
 bool CommandParser::RemoveCommands(const char* source)
 {
-       nspace::hash_map<std::string,command_t*>::iterator i,safei;
+       command_table::iterator i,safei;
        for (i = cmdlist.begin(); i != cmdlist.end(); i++)
        {
                safei = i;
@@ -401,7 +401,7 @@ bool CommandParser::RemoveCommands(const char* source)
        return true;
 }
 
-void CommandParser::RemoveCommand(nspace::hash_map<std::string,command_t*>::iterator safei, const char* source)
+void CommandParser::RemoveCommand(command_table::iterator safei, const char* source)
 {
        command_t* x = safei->second;
        if (x->source == std::string(source))

diff --git a/src/configreader.cpp b/src/configreader.cpp
index f22f5f7b47eea1da213ec848515bbee90492938f..3ba6911916b73ec652d342cadf41e778c30749f5 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -202,13 +202,13 @@ bool InitializeDisabledCommands(const char* data, InspIRCd* ServerInstance)
        std::string thiscmd;
 
        /* Enable everything first */
-       for (nspace::hash_map<std::string,command_t*>::iterator x = ServerInstance->Parser->cmdlist.begin(); x != ServerInstance->Parser->cmdlist.end(); x++)
+       for (command_table::iterator x = ServerInstance->Parser->cmdlist.begin(); x != ServerInstance->Parser->cmdlist.end(); x++)
                x->second->Disable(false);
 
        /* Now disable all the ones which the user wants disabled */
        while (dcmds >> thiscmd)
        {
-               nspace::hash_map<std::string,command_t*>::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd);
+               command_table::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd);
                if (cm != ServerInstance->Parser->cmdlist.end())
                {
                        cm->second->Disable(true);