X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_customprefix.cpp;h=f6f9a84f691220925fd04342a27b2301b897dc9a;hb=fb66fb5ce3410d7e32813aed85e8ad3050584740;hp=bda11e8b31761ad932279780322d2d5f08c8baf0;hpb=54d10d53c730ab81ca6464fe2f0e0ecbcd435672;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_customprefix.cpp b/src/modules/m_customprefix.cpp
index bda11e8b3..f6f9a84f6 100644
--- a/src/modules/m_customprefix.cpp
+++ b/src/modules/m_customprefix.cpp
@@ -19,22 +19,20 @@
 
 #include "inspircd.h"
 
-class CustomPrefixMode : public ModeHandler
+class CustomPrefixMode : public PrefixMode
 {
  public:
 	reference<ConfigTag> tag;
 	bool depriv;
 
 	CustomPrefixMode(Module* parent, ConfigTag* Tag)
-		: ModeHandler(parent, Tag->getString("name"), 0, PARAM_ALWAYS, MODETYPE_CHANNEL), tag(Tag)
+		: PrefixMode(parent, Tag->getString("name"), 0, Tag->getInt("rank"))
+		, tag(Tag)
 	{
-		list = true;
-		m_paramtype = TR_NICK;
 		std::string v = tag->getString("prefix");
 		prefix = v.c_str()[0];
 		v = tag->getString("letter");
 		mode = v.c_str()[0];
-		prefixrank = tag->getInt("rank");
 		levelrequired = tag->getInt("ranktoset", prefixrank);
 		depriv = tag->getBool("depriv", true);
 	}
@@ -45,11 +43,6 @@ class CustomPrefixMode : public ModeHandler
 			return MOD_RES_ALLOW;
 		return MOD_RES_PASSTHRU;
 	}
-
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-	{
-		return MODEACTION_ALLOW;
-	}
 };
 
 class ModuleCustomPrefix : public Module
@@ -75,15 +68,14 @@ class ModuleCustomPrefix : public Module
 			}
 			catch (ModuleException& e)
 			{
-				throw ModuleException(e.err + " (while creating mode from " + tag->getTagLocation() + ")");
+				throw ModuleException(e.GetReason() + " (while creating mode from " + tag->getTagLocation() + ")");
 			}
 		}
 	}
 
 	~ModuleCustomPrefix()
 	{
-		for (std::vector<CustomPrefixMode*>::iterator i = modes.begin(); i != modes.end(); i++)
-			delete *i;
+		stdalgo::delete_all(modes);
 	}
 
 	Version GetVersion() CXX11_OVERRIDE