diff options
| author | attilamolnar <attilamolnar@hush.com> | 2013-08-16 12:20:06 +0200 |
|---|---|---|
| committer | attilamolnar <attilamolnar@hush.com> | 2013-08-30 13:15:10 +0200 |
| commit | d349f981fbe70fb11e3db4c486f59749ffe74c2b (patch) | |
| tree | 8de831914936c0af823fb4969193e58481275a48 /src/commands/cmd_modules.cpp | |
| parent | c202dea024542b9c6c6b771bb9a3a081d9eacdc5 (diff) | |
Remove ModuleManager::GetAllModuleNames(), use GetModules() instead
Diffstat (limited to 'src/commands/cmd_modules.cpp')
| -rw-r--r-- | src/commands/cmd_modules.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/commands/cmd_modules.cpp b/src/commands/cmd_modules.cpp index b8a1805b0..c37008563 100644 --- a/src/commands/cmd_modules.cpp +++ b/src/commands/cmd_modules.cpp @@ -51,11 +51,11 @@ class CommandModules : public Command */ CmdResult CommandModules::Handle (const std::vector<std::string>&, User *user) { - std::vector<std::string> module_names = ServerInstance->Modules->GetAllModuleNames(0); + const ModuleManager::ModuleMap& mods = ServerInstance->Modules->GetModules(); - for (unsigned int i = 0; i < module_names.size(); i++) + for (ModuleManager::ModuleMap::const_iterator i = mods.begin(); i != mods.end(); ++i) { - Module* m = ServerInstance->Modules->Find(module_names[i]); + Module* m = i->second; Version V = m->GetVersion(); if (user->HasPrivPermission("servers/auspex")) @@ -68,17 +68,17 @@ CmdResult CommandModules::Handle (const std::vector<std::string>&, User *user) #ifdef PURE_STATIC user->SendText(":%s 702 %s :%p %s %s :%s", ServerInstance->Config->ServerName.c_str(), - user->nick.c_str(), (void*)m, module_names[i].c_str(), flags.c_str(), V.description.c_str()); + user->nick.c_str(), (void*)m, m->ModuleSourceFile.c_str(), flags.c_str(), V.description.c_str()); #else std::string srcrev = m->ModuleDLLManager->GetVersion(); user->SendText(":%s 702 %s :%p %s %s :%s - %s", ServerInstance->Config->ServerName.c_str(), - user->nick.c_str(), (void*)m, module_names[i].c_str(), flags.c_str(), V.description.c_str(), srcrev.c_str()); + user->nick.c_str(), (void*)m, m->ModuleSourceFile.c_str(), flags.c_str(), V.description.c_str(), srcrev.c_str()); #endif } else { user->SendText(":%s 702 %s :%s %s", ServerInstance->Config->ServerName.c_str(), - user->nick.c_str(), module_names[i].c_str(), V.description.c_str()); + user->nick.c_str(), m->ModuleSourceFile.c_str(), V.description.c_str()); } } user->SendText(":%s 703 %s :End of MODULES list", ServerInstance->Config->ServerName.c_str(), user->nick.c_str()); |