7 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index fae1bb0eb..3a9b1c9c2 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -84,7 +84,7 @@ class ModuleNoCTCP : public Module
 				{
 					if (strncmp(text.c_str(),"\1ACTION ",8))
 					{
-						user->WriteNumeric(492, "%s %s :Can't send CTCP to channel (+C set)",user->nick, c->name);
+						user->WriteNumeric(492, "%s %s :Can't send CTCP to channel (+C set)",user->nick.c_str(), c->name);
 						return 1;
 					}
 				}
diff --git a/src/modules/m_noinvite.cpp b/src/modules/m_noinvite.cpp
index e27ed6f04..dde96383f 100644
--- a/src/modules/m_noinvite.cpp
+++ b/src/modules/m_noinvite.cpp
@@ -40,7 +40,7 @@ class ModuleNoInvite : public Module
 	{
 		if (channel->IsModeSet('V'))
 		{
-			user->WriteNumeric(492, "%s %s :Can't invite %s to channel (+V set)",user->nick, channel->name, dest->nick);
+			user->WriteNumeric(492, "%s %s :Can't invite %s to channel (+V set)",user->nick.c_str(), channel->name, dest->nick.c_str());
 			return 1;
 		}
 		return 0;
diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index 9daa4c66b..dbfa0c2ea 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -46,7 +46,7 @@ class ModuleNoKicks : public Module
 		{
 			if (channel->IsModeSet('Q'))
 			{
-				if ((ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server))
+				if ((ServerInstance->ULine(source->nick.c_str())) || (ServerInstance->ULine(source->server)) || (!*source->server))
 				{
 					// ulines can still kick with +Q in place
 					return ACR_ALLOW;
@@ -54,7 +54,7 @@ class ModuleNoKicks : public Module
 				else
 				{
 					// nobody else can (not even opers with override, and founders)
-					source->WriteNumeric(484, "%s %s :Can't kick user %s from channel (+Q set)",source->nick, channel->name,dest->nick);
+					source->WriteNumeric(484, "%s %s :Can't kick user %s from channel (+Q set)",source->nick.c_str(), channel->name,dest->nick.c_str());
 					return ACR_DENY;
 				}
 			}
diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 6d6391894..c6301d19d 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -85,7 +85,7 @@ class ModuleNoNickChange : public Module
 					if (CHANOPS_EXEMPT(ServerInstance, 'N') && curr->GetStatus(user) == STATUS_OP)
 						continue;
 
-					user->WriteNumeric(447, "%s :Can't change nickname while on %s (+N is set)", user->nick, curr->name);
+					user->WriteNumeric(447, "%s :Can't change nickname while on %s (+N is set)", user->nick.c_str(), curr->name);
 					return 1;
 				}
 			}
diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 1e88a4cc0..920a0d134 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -58,7 +58,7 @@ class ModuleNoNotice : public Module
 				}
 				else
 				{
-					user->WriteNumeric(404, "%s %s :Can't send NOTICE to channel (+T set)",user->nick, c->name);
+					user->WriteNumeric(404, "%s %s :Can't send NOTICE to channel (+T set)",user->nick.c_str(), c->name);
 					return 1;
 				}
 			}
diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index d1111fd86..148528174 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -69,7 +69,7 @@ class ModuleOperChans : public Module
 			{
 				if (chan->IsModeSet('O'))
 				{
-					user->WriteNumeric(520, "%s %s :Only IRC operators may join the channel %s (+O is set)",user->nick, chan->name,chan->name);
+					user->WriteNumeric(520, "%s %s :Only IRC operators may join the channel %s (+O is set)",user->nick.c_str(), chan->name,chan->name);
 					return 1;
 				}
 			}
diff --git a/src/modules/m_operflood.cpp b/src/modules/m_operflood.cpp
index 952f339c2..c9216cba8 100644
--- a/src/modules/m_operflood.cpp
+++ b/src/modules/m_operflood.cpp
@@ -34,7 +34,7 @@ public:
 			return;
 
 		user->ExemptFromPenalty = true;
-		user->WriteServ("NOTICE %s :*** You are now free from flood limits.", user->nick);
+		user->WriteServ("NOTICE %s :*** You are now free from flood limits.", user->nick.c_str());
 	}
 };