Move the wallops mode from the core into core_wallops

3 files changed, 3 insertions, 14 deletions

diff --git a/include/builtinmodes.h b/include/builtinmodes.h
index 6aab727cc..e78e68b11 100644
--- a/include/builtinmodes.h
+++ b/include/builtinmodes.h
@@ -176,13 +176,3 @@ class ModeUserOperator : public ModeHandler
 	ModeUserOperator();
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
 };
-
-/** User mode +w
- */
-class ModeUserWallops : public SimpleUserModeHandler
-{
- public:
-	ModeUserWallops() : SimpleUserModeHandler(NULL, "wallops", 'w')
-	{
-	}
-};
diff --git a/src/coremods/core_wallops.cpp b/src/coremods/core_wallops.cpp
index 731eaf3d2..276da51dc 100644
--- a/src/coremods/core_wallops.cpp
+++ b/src/coremods/core_wallops.cpp
@@ -24,14 +24,14 @@
  */
 class CommandWallops : public Command
 {
-	UserModeReference wallopsmode;
+	SimpleUserModeHandler wallopsmode;
 
  public:
 	/** Constructor for wallops.
 	 */
 	CommandWallops(Module* parent)
 		: Command(parent, "WALLOPS", 1, 1)
-		, wallopsmode(parent, "wallops")
+		, wallopsmode(parent, "wallops", 'w')
 	{
 		flags_needed = 'o';
 		syntax = "<any-text>";
diff --git a/src/mode.cpp b/src/mode.cpp
index b56c26990..1a02b5ec7 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -933,7 +933,6 @@ struct builtin_modes
 	ModeChannelOp o;
 	ModeChannelVoice v;
 
-	ModeUserWallops uw;
 	ModeUserInvisible ui;
 	ModeUserOperator uo;
 	ModeUserServerNoticeMask us;
@@ -941,7 +940,7 @@ struct builtin_modes
 	void init()
 	{
 		ServiceProvider* modes[] = { &s, &p, &m, &t, &n, &i, &k, &l, &b, &o, &v,
-									 &uw, &ui, &uo, &us };
+									 &ui, &uo, &us };
 		ServerInstance->Modules->AddServices(modes, sizeof(modes)/sizeof(ServiceProvider*));
 	}
 };