Small api change with wide reaching effects in modules - Allows modification of whats displayed by NAMES on a per-nick basis, so we can have UHNAMES in a seperate module to NAMESX (and possibly do some funky other stuff in the future too!)

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6934 e03df62e-2008-0410-955e-edbf42e46eb7

3 files changed, 9 insertions, 9 deletions

diff --git a/src/modes/cmode_h.cpp b/src/modes/cmode_h.cpp
index 9bd061cd2..4ecf17c36 100644
--- a/src/modes/cmode_h.cpp
+++ b/src/modes/cmode_h.cpp
@@ -55,13 +55,13 @@ void ModeChannelHalfOp::RemoveMode(chanrec* channel)
 
 	for (CUList::iterator i = list->begin(); i != list->end(); i++)
 	{
-		userrec* n = i->second;
-		copy.insert(std::make_pair(n,n));
+		userrec* n = i->first;
+		copy.insert(std::make_pair(n,n->nick));
 	}
 	for (CUList::iterator i = copy.begin(); i != copy.end(); i++)
 	{
 		sprintf(moderemove,"-%c",this->GetModeChar());
-		const char* parameters[] = { channel->name, moderemove, i->second->nick };
+		const char* parameters[] = { channel->name, moderemove, i->first->nick };
 		ServerInstance->SendMode(parameters, 3, n);
 	}
 	delete n;
diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp
index 855976bba..a77b40ce0 100644
--- a/src/modes/cmode_o.cpp
+++ b/src/modes/cmode_o.cpp
@@ -56,13 +56,13 @@ void ModeChannelOp::RemoveMode(chanrec* channel)
 
 	for (CUList::iterator i = list->begin(); i != list->end(); i++)
 	{
-		userrec* n = i->second;
-		copy.insert(std::make_pair(n,n));
+		userrec* n = i->first;
+		copy.insert(std::make_pair(n,n->nick));
 	}
 	for (CUList::iterator i = copy.begin(); i != copy.end(); i++)
 	{
 		sprintf(moderemove,"-%c",this->GetModeChar());
-		const char* parameters[] = { channel->name, moderemove, i->second->nick };
+		const char* parameters[] = { channel->name, moderemove, i->first->nick };
 		ServerInstance->SendMode(parameters, 3, n);
 	}
 	delete n;
diff --git a/src/modes/cmode_v.cpp b/src/modes/cmode_v.cpp
index 1c3c23527..088726208 100644
--- a/src/modes/cmode_v.cpp
+++ b/src/modes/cmode_v.cpp
@@ -55,13 +55,13 @@ void ModeChannelVoice::RemoveMode(chanrec* channel)
 
 	for (CUList::iterator i = list->begin(); i != list->end(); i++)
 	{
-		userrec* n = i->second;
-		copy.insert(std::make_pair(n,n));
+		userrec* n = i->first;
+		copy.insert(std::make_pair(n,n->nick));
 	}
 	for (CUList::iterator i = copy.begin(); i != copy.end(); i++)
 	{
 		sprintf(moderemove,"-%c",this->GetModeChar());
-		const char* parameters[] = { channel->name, moderemove, i->second->nick };
+		const char* parameters[] = { channel->name, moderemove, i->first->nick };
 		ServerInstance->SendMode(parameters, 3, n);
 	}
 	delete n;