From 76f9f4b47a16888d93bdb6122de0e1f6d7965f4b Mon Sep 17 00:00:00 2001 From: danieldg Date: Tue, 9 Feb 2010 19:35:14 +0000 Subject: [PATCH] Eliminate duplicate names between user and channel modes git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12414 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_censor.cpp | 2 +- src/modules/m_services_account.cpp | 5 ++--- src/modules/m_stripcolor.cpp | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp index e356ee9a7..6a9f6941f 100644 --- a/src/modules/m_censor.cpp +++ b/src/modules/m_censor.cpp @@ -26,7 +26,7 @@ typedef std::map censor_t; class CensorUser : public SimpleUserModeHandler { public: - CensorUser(Module* Creator) : SimpleUserModeHandler(Creator, "censor", 'G') { } + CensorUser(Module* Creator) : SimpleUserModeHandler(Creator, "u_censor", 'G') { } }; /** Handles channel mode +G diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index 175e18861..4b047ea07 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -20,9 +20,8 @@ */ class Channel_r : public ModeHandler { - public: - Channel_r(Module* Creator) : ModeHandler(Creator, "registered", 'r', PARAM_NONE, MODETYPE_CHANNEL) { } + Channel_r(Module* Creator) : ModeHandler(Creator, "c_registered", 'r', PARAM_NONE, MODETYPE_CHANNEL) { } ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { @@ -52,7 +51,7 @@ class User_r : public ModeHandler { public: - User_r(Module* Creator) : ModeHandler(Creator, "registered", 'r', PARAM_NONE, MODETYPE_USER) { } + User_r(Module* Creator) : ModeHandler(Creator, "u_registered", 'r', PARAM_NONE, MODETYPE_USER) { } ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp index 8034f56ee..113c931cb 100644 --- a/src/modules/m_stripcolor.cpp +++ b/src/modules/m_stripcolor.cpp @@ -28,7 +28,7 @@ class ChannelStripColor : public SimpleChannelModeHandler class UserStripColor : public SimpleUserModeHandler { public: - UserStripColor(Module* Creator) : SimpleUserModeHandler(Creator, "stripcolor", 'S') { } + UserStripColor(Module* Creator) : SimpleUserModeHandler(Creator, "u_stripcolor", 'S') { } }; -- 2.39.5