Fix a bunch of weird indentation and spacing issues.

[user/henk/code/inspircd.git] / src / modules.cpp

diff --git a/src/modules.cpp b/src/modules.cpp
index a39fcb6c19e33d3a7623a88890a0a40f0b4f15a4..f940a0fd8948e20aaf0cf6ed53a99fd3a3eb50fa 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -15,7 +15,7 @@
  *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Oliver Lupton <om@inspircd.org>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2006-2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2005-2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -138,13 +138,13 @@ void              Module::OnChangeIdent(User*, const std::string&) { DetachEvent(I_OnChangeI
 void           Module::OnAddLine(User*, XLine*) { DetachEvent(I_OnAddLine); }
 void           Module::OnDelLine(User*, XLine*) { DetachEvent(I_OnDelLine); }
 void           Module::OnExpireLine(XLine*) { DetachEvent(I_OnExpireLine); }
-void           Module::OnCleanup(ExtensionItem::ExtensibleType, Extensible*) { }
+void           Module::OnCleanup(ExtensionItem::ExtensibleType, Extensible*) { }
 ModResult      Module::OnChannelPreDelete(Channel*) { DetachEvent(I_OnChannelPreDelete); return MOD_RES_PASSTHRU; }
 void           Module::OnChannelDelete(Channel*) { DetachEvent(I_OnChannelDelete); }
 void           Module::OnBuildNeighborList(User*, IncludeChanList&, std::map<User*,bool>&) { DetachEvent(I_OnBuildNeighborList); }
 void           Module::OnGarbageCollect() { DetachEvent(I_OnGarbageCollect); }
 ModResult      Module::OnSetConnectClass(LocalUser* user, ConnectClass* myclass) { DetachEvent(I_OnSetConnectClass); return MOD_RES_PASSTHRU; }
-void           Module::OnUserMessage(User*, const MessageTarget&, const MessageDetails&) { DetachEvent(I_OnUserMessage); }
+void           Module::OnUserMessage(User*, const MessageTarget&, const MessageDetails&) { DetachEvent(I_OnUserMessage); }
 ModResult      Module::OnNumeric(User*, const Numeric::Numeric&) { DetachEvent(I_OnNumeric); return MOD_RES_PASSTHRU; }
 ModResult   Module::OnAcceptConnection(int, ListenSocket*, irc::sockets::sockaddrs*, irc::sockets::sockaddrs*) { DetachEvent(I_OnAcceptConnection); return MOD_RES_PASSTHRU; }
 void           Module::OnSetUserIP(LocalUser*) { DetachEvent(I_OnSetUserIP); }
@@ -425,9 +425,9 @@ void ModuleManager::DoSafeUnload(Module* mod)
                user->doUnhookExtensions(items);
        }
 
-       for(std::multimap<std::string, ServiceProvider*>::iterator i = DataProviders.begin(); i != DataProviders.end(); )
+       for (DataProviderMap::iterator i = DataProviders.begin(); i != DataProviders.end(); )
        {
-               std::multimap<std::string, ServiceProvider*>::iterator curr = i++;
+               DataProviderMap::iterator curr = i++;
                if (curr->second->creator == mod)
                {
                        DataProviders.erase(curr);
@@ -442,7 +442,7 @@ void ModuleManager::DoSafeUnload(Module* mod)
        Modules.erase(modfind);
        ServerInstance->GlobalCulls.AddItem(mod);
 
-       ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "Module %s unloaded",mod->ModuleSourceFile.c_str());
+       ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "The %s module was unloaded", mod->ModuleSourceFile.c_str());
        ServerInstance->ISupport.Build();
 }
 
@@ -642,7 +642,7 @@ ServiceProvider* ModuleManager::FindService(ServiceType type, const std::string&
                case SERVICE_DATA:
                case SERVICE_IOHOOK:
                {
-                       std::multimap<std::string, ServiceProvider*>::iterator i = DataProviders.find(name);
+                       DataProviderMap::iterator i = DataProviders.find(name);
                        if (i != DataProviders.end() && i->second->service == type)
                                return i->second;
                        return NULL;
@@ -696,7 +696,7 @@ void dynamic_reference_base::resolve()
 {
        // Because find() may return any element with a matching key in case count(key) > 1 use lower_bound()
        // to ensure a dynref with the same name as another one resolves to the same object
-       std::multimap<std::string, ServiceProvider*>::iterator i = ServerInstance->Modules.DataProviders.lower_bound(name);
+       ModuleManager::DataProviderMap::iterator i = ServerInstance->Modules.DataProviders.lower_bound(name);
        if ((i != ServerInstance->Modules.DataProviders.end()) && (i->first == this->name))
        {
                ServiceProvider* newvalue = i->second;
@@ -729,7 +729,7 @@ void ModuleManager::AddReferent(const std::string& name, ServiceProvider* servic
 
 void ModuleManager::DelReferent(ServiceProvider* service)
 {
-       for (std::multimap<std::string, ServiceProvider*>::iterator i = DataProviders.begin(); i != DataProviders.end(); )
+       for (DataProviderMap::iterator i = DataProviders.begin(); i != DataProviders.end(); )
        {
                ServiceProvider* curr = i->second;
                if (curr == service)