diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2014-12-15 17:14:09 +0100 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-12-15 17:14:09 +0100 |
| commit | 56af4909b89d3edfe919fe28178c18dcaa9cee47 (patch) | |
| tree | fb3024b1f1ef1923fee36bbaa960659d4ce7195b /src/mode.cpp | |
| parent | bc6090c224e2feaeaad63064100a592e5dfa4546 (diff) | |
Add typedef ModeParser::ModeWatcherMap, remove ModeWatchIter
Diffstat (limited to 'src/mode.cpp')
| -rw-r--r-- | src/mode.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mode.cpp b/src/mode.cpp index 0d3de3890..b7aef1cdc 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -268,8 +268,8 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, Mode } // Ask mode watchers whether this mode change is OK - std::pair<ModeWatchIter, ModeWatchIter> itpair = modewatchermap.equal_range(mh->name); - for (ModeWatchIter i = itpair.first; i != itpair.second; ++i) + std::pair<ModeWatcherMap::iterator, ModeWatcherMap::iterator> itpair = modewatchermap.equal_range(mh->name); + for (ModeWatcherMap::iterator i = itpair.first; i != itpair.second; ++i) { ModeWatcher* mw = i->second; if (mw->GetModeType() == type) @@ -320,7 +320,7 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, Mode return ma; itpair = modewatchermap.equal_range(mh->name); - for (ModeWatchIter i = itpair.first; i != itpair.second; ++i) + for (ModeWatcherMap::iterator i = itpair.first; i != itpair.second; ++i) { ModeWatcher* mw = i->second; if (mw->GetModeType() == type) @@ -496,8 +496,8 @@ void ModeParser::ShowListModeList(User* user, Channel* chan, ModeHandler* mh) bool display = true; // Ask mode watchers whether it's OK to show the list - std::pair<ModeWatchIter, ModeWatchIter> itpair = modewatchermap.equal_range(mh->name); - for (ModeWatchIter i = itpair.first; i != itpair.second; ++i) + std::pair<ModeWatcherMap::iterator, ModeWatcherMap::iterator> itpair = modewatchermap.equal_range(mh->name); + for (ModeWatcherMap::iterator i = itpair.first; i != itpair.second; ++i) { ModeWatcher* mw = i->second; if (mw->GetModeType() == MODETYPE_CHANNEL) @@ -816,8 +816,8 @@ void ModeParser::AddModeWatcher(ModeWatcher* mw) bool ModeParser::DelModeWatcher(ModeWatcher* mw) { - std::pair<ModeWatchIter, ModeWatchIter> itpair = modewatchermap.equal_range(mw->GetModeName()); - for (ModeWatchIter i = itpair.first; i != itpair.second; ++i) + std::pair<ModeWatcherMap::iterator, ModeWatcherMap::iterator> itpair = modewatchermap.equal_range(mw->GetModeName()); + for (ModeWatcherMap::iterator i = itpair.first; i != itpair.second; ++i) { if (i->second == mw) { |