Added patricia_tree::iterator

15 files changed, 25 insertions, 29 deletions

diff --git a/modules/core/bs_botlist.cpp b/modules/core/bs_botlist.cpp
index 6ca1b8d45..37901a4a0 100644
--- a/modules/core/bs_botlist.cpp
+++ b/modules/core/bs_botlist.cpp
@@ -31,7 +31,7 @@ class CommandBSBotList : public Command
 			return MOD_CONT;
 		}
 
-		for (patricia_tree<BotInfo *>::const_iterator it = BotListByNick.begin(), it_end = BotListByNick.end(); it != it_end; ++it)
+		for (patricia_tree<BotInfo *, ci::ci_char_traits>::iterator it(BotListByNick); it.next();)
 		{
 			BotInfo *bi = *it;
 
@@ -48,7 +48,7 @@ class CommandBSBotList : public Command
 		{
 			source.Reply(BOT_BOTLIST_PRIVATE_HEADER);
 
-			for (patricia_tree<BotInfo *>::const_iterator it = BotListByNick.begin(), it_end = BotListByNick.end(); it != it_end; ++it)
+			for (patricia_tree<BotInfo *, ci::ci_char_traits>::iterator it(BotListByNick); it.next();)
 			{
 				BotInfo *bi = *it;
 
diff --git a/modules/core/cs_akick.cpp b/modules/core/cs_akick.cpp
index 444c79c46..34d3c8369 100644
--- a/modules/core/cs_akick.cpp
+++ b/modules/core/cs_akick.cpp
@@ -214,7 +214,7 @@ class CommandCSAKick : public Command
 		{
 			/* Match against all currently online users with equal or
 			 * higher access. - Viper */
-			for (patricia_tree<User *>::const_iterator it = UserListByNick.begin(), it_end = UserListByNick.end(); it != it_end; ++it)
+			for (patricia_tree<User *, ci::ci_char_traits>::iterator it(UserListByNick); it.next();)
 			{
 				User *u2 = *it;
 
diff --git a/modules/core/db_plain.cpp b/modules/core/db_plain.cpp
index e589d85f6..695738087 100644
--- a/modules/core/db_plain.cpp
+++ b/modules/core/db_plain.cpp
@@ -826,7 +826,7 @@ class DBPlain : public Module
 			FOREACH_MOD(I_OnDatabaseWriteMetadata, OnDatabaseWriteMetadata(WriteMetadata, na));
 		}
 
-		for (patricia_tree<BotInfo *>::const_iterator it = BotListByNick.begin(), it_end = BotListByNick.end(); it != it_end; ++it)
+		for (patricia_tree<BotInfo *, ci::ci_char_traits>::iterator it(BotListByNick); it.next();)
 		{
 			BotInfo *bi = *it;
 
diff --git a/modules/core/os_akill.cpp b/modules/core/os_akill.cpp
index 215d4e3c3..f5212cb2b 100644
--- a/modules/core/os_akill.cpp
+++ b/modules/core/os_akill.cpp
@@ -175,7 +175,7 @@ class CommandOSAKill : public Command
 			if (user)
 				mask = "*@" + user->host;
 			unsigned int affected = 0;
-			for (patricia_tree<User *>::const_iterator it = UserListByNick.begin(), it_end = UserListByNick.end(); it != it_end; ++it)
+			for (patricia_tree<User *, ci::ci_char_traits>::iterator it(UserListByNick); it.next();)
 				if (Anope::Match((*it)->GetIdent() + "@" + (*it)->host, mask))
 					++affected;
 			float percent = static_cast<float>(affected) / static_cast<float>(UserListByNick.size()) * 100.0;
diff --git a/modules/core/os_noop.cpp b/modules/core/os_noop.cpp
index 65915c176..49f29d2c9 100644
--- a/modules/core/os_noop.cpp
+++ b/modules/core/os_noop.cpp
@@ -39,10 +39,11 @@ class CommandOSNOOP : public Command
 			source.Reply(OPER_NOOP_SET, server.c_str());
 
 			/* Kill all the IRCops of the server */
-			for (patricia_tree<User *>::const_iterator it = UserListByNick.begin(), it_end = UserListByNick.end(); it != it_end; ++it)
+			patricia_tree<User *, ci::ci_char_traits>::iterator it(UserListByNick);
+			for (bool next = it.next(); next;)
 			{
 				User *u2 = *it;
-				++it;
+				next = it.next();
 
 				if (u2 && u2->HasMode(UMODE_OPER) && Anope::Match(u2->server->GetName(), server, true))
 					kill_user(Config->s_OperServ, u2, reason);
diff --git a/modules/core/os_session.cpp b/modules/core/os_session.cpp
index 5c1dfc0ed..712603fa4 100644
--- a/modules/core/os_session.cpp
+++ b/modules/core/os_session.cpp
@@ -134,7 +134,7 @@ class CommandOSSession : public Command
 			source.Reply(OPER_SESSION_LIST_HEADER, mincount);
 			source.Reply(OPER_SESSION_LIST_COLHEAD);
 
-			for (patricia_tree<Session *>::const_iterator it = SessionList.begin(), it_end = SessionList.end(); it != it_end; ++it)
+			for (patricia_tree<Session *>::iterator it(SessionList); it.next();)
 			{
 				Session *session = *it;
 
diff --git a/modules/core/os_snline.cpp b/modules/core/os_snline.cpp
index 5845c6d25..9ea88ec5e 100644
--- a/modules/core/os_snline.cpp
+++ b/modules/core/os_snline.cpp
@@ -190,7 +190,7 @@ class CommandOSSNLine : public Command
 			if (mask[masklen - 1] == ' ')
 				mask.erase(masklen - 1);
 			unsigned int affected = 0;
-			for (patricia_tree<User *>::const_iterator it = UserListByNick.begin(), it_end = UserListByNick.end(); it != it_end; ++it)
+			for (patricia_tree<User *, ci::ci_char_traits>::iterator it(UserListByNick); it.next();)
 				if (Anope::Match((*it)->realname, mask))
 					++affected;
 			float percent = static_cast<float>(affected) / static_cast<float>(UserListByNick.size()) * 100.0;
diff --git a/modules/core/os_sqline.cpp b/modules/core/os_sqline.cpp
index 72a208be2..dbf6dcbe4 100644
--- a/modules/core/os_sqline.cpp
+++ b/modules/core/os_sqline.cpp
@@ -171,7 +171,7 @@ class CommandOSSQLine : public Command
 		if (!mask.empty() && !reason.empty())
 		{
 			unsigned int affected = 0;
-			for (patricia_tree<User *>::const_iterator it = UserListByNick.begin(), it_end = UserListByNick.end(); it != it_end; ++it)
+			for (patricia_tree<User *, ci::ci_char_traits>::iterator it(UserListByNick); it.next();)
 				if (Anope::Match((*it)->nick, mask))
 					++affected;
 			float percent = static_cast<float>(affected) / static_cast<float>(UserListByNick.size()) * 100.0;
diff --git a/modules/core/os_staff.cpp b/modules/core/os_staff.cpp
index 5c5e7fac1..5b1af9ae1 100644
--- a/modules/core/os_staff.cpp
+++ b/modules/core/os_staff.cpp
@@ -26,27 +26,22 @@ class CommandOSStaff : public Command
 
 		for (std::list<std::pair<Anope::string, Anope::string> >::iterator it = Config->Opers.begin(), it_end = Config->Opers.end(); it != it_end; ++it)
 		{
-			int found = 0;
 			Anope::string nick = it->first, type = it->second;
 
 			NickAlias *na = findnick(nick);
 			if (na)
 			{
-				/* We have to loop all users as some may be logged into an account but not a nick */
-				for (patricia_tree<User *>::const_iterator uit = UserListByNick.begin(), uit_end = UserListByNick.end(); uit != uit_end; ++uit)
+				NickCore *nc = na->nc;
+				for (std::list<User *>::iterator uit = nc->Users.begin(); uit != nc->Users.end(); ++uit)
 				{
 					User *u2 = *uit;
 
-					if (u2->Account() && u2->Account() == na->nc)
-					{
-						found = 1;
-						if (na->nick.equals_ci(u2->nick))
-							source.Reply(OPER_STAFF_FORMAT, '*', type.c_str(), u2->nick.c_str());
-						else
-							source.Reply(OPER_STAFF_AFORMAT, '*', type.c_str(), na->nick.c_str(), u2->nick.c_str());
-					}
+					if (na->nick.equals_ci(u2->nick))
+						source.Reply(OPER_STAFF_FORMAT, '*', type.c_str(), u2->nick.c_str());
+					else
+						source.Reply(OPER_STAFF_AFORMAT, '*', type.c_str(), na->nick.c_str(), u2->nick.c_str());
 				}
-				if (!found)
+				if (nc->Users.empty())
 					source.Reply(OPER_STAFF_FORMAT, ' ', type.c_str(), na->nick.c_str());
 			}
 		}
diff --git a/modules/core/os_szline.cpp b/modules/core/os_szline.cpp
index 7e9783c8d..4535335ed 100644
--- a/modules/core/os_szline.cpp
+++ b/modules/core/os_szline.cpp
@@ -174,7 +174,7 @@ class CommandOSSZLine : public Command
 			if (user && user->ip())
 				mask = user->ip.addr();
 			unsigned int affected = 0;
-			for (patricia_tree<User *>::const_iterator it = UserListByNick.begin(), it_end = UserListByNick.end(); it != it_end; ++it)
+			for (patricia_tree<User *, ci::ci_char_traits>::iterator it(UserListByNick); it.next();)
 				if ((*it)->ip() && Anope::Match((*it)->ip.addr(), mask))
 					++affected;
 			float percent = static_cast<float>(affected) / static_cast<float>(UserListByNick.size()) * 100.0;
diff --git a/modules/core/os_userlist.cpp b/modules/core/os_userlist.cpp
index 80448d35c..4f5c9d0f9 100644
--- a/modules/core/os_userlist.cpp
+++ b/modules/core/os_userlist.cpp
@@ -50,7 +50,7 @@ class CommandOSUserList : public Command
 		{
 			source.Reply(OPER_USERLIST_HEADER);
 
-			for (patricia_tree<User *>::const_iterator it = UserListByNick.begin(), it_end = UserListByNick.end(); it != it_end; ++it)
+			for (patricia_tree<User *, ci::ci_char_traits>::iterator it(UserListByNick); it.next();)
 			{
 				User *u2 = *it;
 
diff --git a/modules/extra/db_mysql.cpp b/modules/extra/db_mysql.cpp
index b90ab0834..180b66463 100644
--- a/modules/extra/db_mysql.cpp
+++ b/modules/extra/db_mysql.cpp
@@ -745,7 +745,7 @@ class DBMySQL : public Module
 			FOREACH_MOD(I_OnDatabaseWriteMetadata, OnDatabaseWriteMetadata(WriteChannelMetadata, CurChannel));
 		}
 
-		for (patricia_tree<BotInfo *>::const_iterator it = BotListByNick.begin(), it_end = BotListByNick.end(); it != it_end; ++it)
+		for (patricia_tree<BotInfo *, ci::ci_char_traits>::iterator it(BotListByNick); it.next();)
 		{
 			CurBot = *it;
 			FOREACH_MOD(I_OnDatabaseWriteMetadata, OnDatabaseWriteMetadata(WriteBotMetadata, CurBot));
@@ -1315,7 +1315,7 @@ static void SaveDatabases()
 
 	me->RunQuery("TRUNCATE TABLE `anope_bs_core`");
 
-	for (patricia_tree<BotInfo *>::const_iterator it = BotListByNick.begin(), it_end = BotListByNick.end(); it != it_end; ++it)
+	for (patricia_tree<BotInfo *, ci::ci_char_traits>::iterator it(BotListByNick); it.next();)
 		me->OnBotCreate(*it);
 
 	me->RunQuery("TRUNCATE TABLE `anope_cs_info`");
diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp
index 824d931ff..9efc80b51 100644
--- a/modules/protocol/inspircd12.cpp
+++ b/modules/protocol/inspircd12.cpp
@@ -326,7 +326,7 @@ bool event_endburst(const Anope::string &source, const std::vector<Anope::string
 	if (!s)
 		throw CoreException("Got ENDBURST without a source");
 
-	for (patricia_tree<User *>::const_iterator it = UserListByNick.begin(), it_end = UserListByNick.end(); it != it_end; ++it)
+	for (patricia_tree<User *, ci::ci_char_traits>::iterator it(UserListByNick); it.next();)
 	{
 		User *u = *it;
 		if (u->server == s && !u->IsIdentified())
diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp
index e24a5c0c4..dcfdbf298 100644
--- a/modules/protocol/inspircd20.cpp
+++ b/modules/protocol/inspircd20.cpp
@@ -312,7 +312,7 @@ bool event_endburst(const Anope::string &source, const std::vector<Anope::string
 	if (!s)
 		throw CoreException("Got ENDBURST without a source");
 
-	for (patricia_tree<User *>::const_iterator it = UserListByNick.begin(), it_end = UserListByNick.end(); it != it_end; ++it)
+	for (patricia_tree<User *, ci::ci_char_traits>::iterator it(UserListByNick); it.next();)
 	{
 		User *u = *it;
 		if (u->server == s && !u->IsIdentified())
diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp
index 634627715..8243e605a 100644
--- a/modules/protocol/plexus.cpp
+++ b/modules/protocol/plexus.cpp
@@ -580,7 +580,7 @@ bool event_eob(const Anope::string &source, const std::vector<Anope::string> &pa
 	if (s)
 	{
 		s->Sync(true);
-		for (patricia_tree<User *>::const_iterator it = UserListByNick.begin(), it_end = UserListByNick.end(); it != it_end; ++it)
+		for (patricia_tree<User *, ci::ci_char_traits>::iterator it(UserListByNick); it.next();)
 		{
 			User *u = *it;
 			if (u->server == s && !u->IsIdentified())