Rewrite tokenstream and move to stringutils.

1 files changed, 7 insertions, 9 deletions

diff --git a/modules/alias.cpp b/modules/alias.cpp
index b992c6b9b..75dbc8c87 100644
--- a/modules/alias.cpp
+++ b/modules/alias.cpp
@@ -26,6 +26,7 @@
 
 
 #include "inspircd.h"
+#include "stringutils.h"
 
 /** An alias definition
  */
@@ -377,19 +378,16 @@ public:
 				result.push_back(c);
 		}
 
-		irc::tokenstream ss(result);
-		CommandBase::Params pars;
+		MessageTokenizer tokenizer(result);
+
 		std::string command;
-		std::string token;
+		tokenizer.GetMiddle(command);
 
-		ss.GetMiddle(command);
-		while (ss.GetTrailing(token))
-		{
-			pars.push_back(token);
-		}
+		CommandBase::Params parameters;
+		tokenizer.GetRemainingTrailing(parameters);
 
 		active = true;
-		ServerInstance->Parser.ProcessCommand(user, command, pars);
+		ServerInstance->Parser.ProcessCommand(user, command, parameters);
 		active = false;
 	}