From bc8664c5c49f4ac9adbc5e3937a584e4a6b35614 Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Sat, 19 Jul 2014 14:23:31 +0200 Subject: Move and rename typedef LocalUserList to UserManager::LocalList --- src/modules/extra/m_geoip.cpp | 2 +- src/modules/m_close.cpp | 2 +- src/modules/m_jumpserver.cpp | 2 +- src/modules/m_modenotice.cpp | 2 +- src/modules/m_nationalchars.cpp | 2 +- src/modules/m_spanningtree/main.cpp | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/modules') diff --git a/src/modules/extra/m_geoip.cpp b/src/modules/extra/m_geoip.cpp index 394f7f9b4..f8e358bf7 100644 --- a/src/modules/extra/m_geoip.cpp +++ b/src/modules/extra/m_geoip.cpp @@ -56,7 +56,7 @@ class ModuleGeoIP : public Module if (gi == NULL) throw ModuleException("Unable to initialize geoip, are you missing GeoIP.dat?"); - for (LocalUserList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); ++i) + for (UserManager::LocalList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); ++i) { LocalUser* user = *i; if ((user->registered == REG_ALL) && (!ext.get(user))) diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp index 9c5c9a77b..f8bac669d 100644 --- a/src/modules/m_close.cpp +++ b/src/modules/m_close.cpp @@ -35,7 +35,7 @@ class CommandClose : public Command { std::map closed; - for (LocalUserList::const_iterator u = ServerInstance->Users->local_users.begin(); u != ServerInstance->Users->local_users.end(); ++u) + for (UserManager::LocalList::const_iterator u = ServerInstance->Users->local_users.begin(); u != ServerInstance->Users->local_users.end(); ++u) { LocalUser* user = *u; if (user->registered != REG_ALL) diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp index 523500e50..9ee224704 100644 --- a/src/modules/m_jumpserver.cpp +++ b/src/modules/m_jumpserver.cpp @@ -108,7 +108,7 @@ class CommandJumpserver : public Command if (redirect_all_immediately) { /* Redirect everyone but the oper sending the command */ - for (LocalUserList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); ++i) + for (UserManager::LocalList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); ++i) { LocalUser* t = *i; if (!t->IsOper()) diff --git a/src/modules/m_modenotice.cpp b/src/modules/m_modenotice.cpp index e02c9147f..0078c6325 100644 --- a/src/modules/m_modenotice.cpp +++ b/src/modules/m_modenotice.cpp @@ -32,7 +32,7 @@ class CommandModeNotice : public Command { std::string msg = "*** From " + src->nick + ": " + parameters[1]; int mlen = parameters[0].length(); - for (LocalUserList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++) + for (UserManager::LocalList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); ++i) { User* user = *i; for (int n = 0; n < mlen; n++) diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp index 6889e388f..3efd97a24 100644 --- a/src/modules/m_nationalchars.cpp +++ b/src/modules/m_nationalchars.cpp @@ -261,7 +261,7 @@ class ModuleNationalChars : public Module if (!forcequit) return; - for (LocalUserList::const_iterator iter = ServerInstance->Users->local_users.begin(); iter != ServerInstance->Users->local_users.end(); ++iter) + for (UserManager::LocalList::const_iterator iter = ServerInstance->Users->local_users.begin(); iter != ServerInstance->Users->local_users.end(); ++iter) { /* Fix by Brain: Dont quit UID users */ User* n = *iter; diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 979048d65..b24d8c6ee 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -62,16 +62,16 @@ namespace // Does not change the server of quitting users because those are not in the list ServerInstance->FakeClient->server = newserver; - const LocalUserList& list = ServerInstance->Users->local_users; - for (LocalUserList::const_iterator i = list.begin(); i != list.end(); ++i) + const UserManager::LocalList& list = ServerInstance->Users->local_users; + for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i) (*i)->server = newserver; } void ResetMembershipIds() { // Set all membership ids to 0 - const LocalUserList& list = ServerInstance->Users->local_users; - for (LocalUserList::iterator i = list.begin(); i != list.end(); ++i) + const UserManager::LocalList& list = ServerInstance->Users->local_users; + for (UserManager::LocalList::iterator i = list.begin(); i != list.end(); ++i) { LocalUser* user = *i; for (User::ChanList::iterator j = user->chans.begin(); j != user->chans.end(); ++j) -- cgit v1.2.3