3 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index acac7640a..c439f3bfe 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -47,13 +47,13 @@ class ModuleModesOnConnect : public Module
 		if (!ThisModes.empty())
 		{
 			std::string buf;
-			std::stringstream ss(ThisModes);
+			irc::spacesepstream ss(ThisModes);
 
 			std::vector<std::string> modes;
 			modes.push_back(user->nick);
 
 			// split ThisUserModes into modes and mode params
-			while (ss >> buf)
+			while (ss.GetToken(buf))
 				modes.push_back(buf);
 
 			ServerInstance->Parser.CallHandler("MODE", modes, user);
diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index 33ebb57a0..6a18e9c9d 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -52,12 +52,12 @@ class ModuleModesOnOper : public Module
 			smodes = "+" + smodes;
 
 		std::string buf;
-		std::stringstream ss(smodes);
+		irc::spacesepstream ss(smodes);
 		std::vector<std::string> modes;
 
 		modes.push_back(u->nick);
 		// split into modes and mode params
-		while (ss >> buf)
+		while (ss.GetToken(buf))
 			modes.push_back(buf);
 
 		ServerInstance->Parser.CallHandler("MODE", modes, u);
diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 28faf898b..417d67b69 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -217,10 +217,10 @@ class ModuleShun : public Module
 
 		ShunEnabledCommands.clear();
 
-		std::stringstream dcmds(cmds);
+		irc::spacesepstream dcmds(cmds);
 		std::string thiscmd;
 
-		while (dcmds >> thiscmd)
+		while (dcmds.GetToken(thiscmd))
 		{
 			ShunEnabledCommands.insert(thiscmd);
 		}