Change SERVICE_{CMODE,UMODE} to SERVICE_MODE, which makes more sense

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

diff --git a/include/base.h b/include/base.h
index 46855a06f890ee4f034e67465770fb338845fd13..e75b4029fe27903f56b03617a57ed264c1f37c0d 100644 (file)
--- a/include/base.h
+++ b/include/base.h
@@ -200,10 +200,8 @@ typedef const reference<Module> ModuleRef;
 enum ServiceType {
        /** is a Command */
        SERVICE_COMMAND,
-       /** is a channel ModeHandler */
-       SERVICE_CMODE,
-       /** is a user ModeHandler */
-       SERVICE_UMODE,
+       /** is a ModeHandler */
+       SERVICE_MODE,
        /** is a metadata descriptor */
        SERVICE_METADATA,
        /** is a data processing provider (MD5, SQL) */

diff --git a/src/mode.cpp b/src/mode.cpp
index 637eb7ba5c805d30ef01c60d6e0afdc9c33bebc7..a632ab516916f02cf4b37d44a26c90ea64a388aa 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -46,7 +46,7 @@
 #include "modes/umode_s.h"
 
 ModeHandler::ModeHandler(Module* Creator, const std::string& Name, char modeletter, ParamSpec Params, ModeType type)
-       : ServiceProvider(Creator, Name, type == MODETYPE_CHANNEL ? SERVICE_CMODE : SERVICE_UMODE), m_paramtype(TR_TEXT),
+       : ServiceProvider(Creator, Name, SERVICE_MODE), m_paramtype(TR_TEXT),
        parameters_taken(Params), mode(modeletter), prefix(0), oper(false),
        list(false), m_type(type), levelrequired(HALFOP_VALUE)
 {

diff --git a/src/modules.cpp b/src/modules.cpp
index 52a25d37cc8e0a43001776e402675eaf450364a1..bfe0deecb812abec95498ab1bde4808489b00900 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -433,8 +433,7 @@ void ModuleManager::AddService(ServiceProvider& item)
                        if (!ServerInstance->Parser->AddCommand(static_cast<Command*>(&item)))
                                throw ModuleException("Command "+std::string(item.name)+" already exists.");
                        return;
-               case SERVICE_CMODE:
-               case SERVICE_UMODE:
+               case SERVICE_MODE:
                        if (!ServerInstance->Modes->AddMode(static_cast<ModeHandler*>(&item)))
                                throw ModuleException("Mode "+std::string(item.name)+" already exists.");
                        return;