Merge pull request #971 from SaberUK/master+numeric-xline

[user/henk/code/inspircd.git] / include / builtinmodes.h

diff --git a/include/builtinmodes.h b/include/builtinmodes.h
index e78e68b1124376cddc4397c3aaac21a1aacac9f7..62ccaf62d18dd95fd9c2b42983fffdc09892722a 100644 (file)
--- a/include/builtinmodes.h
+++ b/include/builtinmodes.h
@@ -35,20 +35,11 @@ class ModeChannelBan : public ListModeBase
        }
 };
 
-/** Channel mode +i
- */
-class ModeChannelInviteOnly : public SimpleChannelModeHandler
-{
- public:
-       ModeChannelInviteOnly() : SimpleChannelModeHandler(NULL, "inviteonly", 'i')
-       {
-       }
-};
-
 /** Channel mode +k
  */
 class ModeChannelKey : public ParamMode<ModeChannelKey, LocalStringExt>
 {
+       static const std::string::size_type maxkeylen = 32;
  public:
        ModeChannelKey();
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
@@ -67,61 +58,15 @@ class ModeChannelLimit : public ParamMode<ModeChannelLimit, LocalIntExt>
        ModeAction OnSet(User* source, Channel* channel, std::string& parameter);
 };
 
-/** Channel mode +m
- */
-class ModeChannelModerated : public SimpleChannelModeHandler
-{
- public:
-       ModeChannelModerated() : SimpleChannelModeHandler(NULL, "moderated", 'm')
-       {
-       }
-};
-
-/** Channel mode +n
- */
-class ModeChannelNoExternal : public SimpleChannelModeHandler
-{
- public:
-       ModeChannelNoExternal() : SimpleChannelModeHandler(NULL, "noextmsg", 'n')
-       {
-       }
-};
-
 /** Channel mode +o
  */
 class ModeChannelOp : public PrefixMode
 {
  public:
-       ModeChannelOp();
-};
-
-/** Channel mode +p
- */
-class ModeChannelPrivate : public SimpleChannelModeHandler
-{
- public:
-       ModeChannelPrivate() : SimpleChannelModeHandler(NULL, "private", 'p')
-       {
-       }
-};
-
-/** Channel mode +s
- */
-class ModeChannelSecret : public SimpleChannelModeHandler
-{
- public:
-       ModeChannelSecret() : SimpleChannelModeHandler(NULL, "secret", 's')
-       {
-       }
-};
-
-/** Channel mode +t
- */
-class ModeChannelTopicOps : public SimpleChannelModeHandler
-{
- public:
-       ModeChannelTopicOps() : SimpleChannelModeHandler(NULL, "topiclock", 't')
+       ModeChannelOp()
+               : PrefixMode(NULL, "op", 'o', OP_VALUE, '@')
        {
+               levelrequired = OP_VALUE;
        }
 };
 
@@ -130,16 +75,10 @@ class ModeChannelTopicOps : public SimpleChannelModeHandler
 class ModeChannelVoice : public PrefixMode
 {
  public:
-       ModeChannelVoice();
-};
-
-/** User mode +i
- */
-class ModeUserInvisible : public SimpleUserModeHandler
-{
- public:
-       ModeUserInvisible() : SimpleUserModeHandler(NULL, "invisible", 'i')
+       ModeChannelVoice()
+               : PrefixMode(NULL, "voice", 'v', VOICE_VALUE, '+')
        {
+               levelrequired = HALFOP_VALUE;
        }
 };