Actually use irc::modestacker correctly

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

diff --git a/include/u_listmode.h b/include/u_listmode.h
index 7212460271ebfd1c5aa3feab2b9723a3073b668b..eb3cf18b7e2694c4c9d3ecae59792a2735fad226 100644 (file)
--- a/include/u_listmode.h
+++ b/include/u_listmode.h
@@ -217,12 +217,9 @@ class ListModeBase : public ModeHandler
 
                        while (modestack.GetStackedLine(stackresult))
                        {
-                               for (size_t j = 0; j < stackresult.size(); j++)
-                               {
-                                       mode_junk.push_back(stackresult[j]);
-                               }
-
+                               mode_junk.insert(mode_junk.end(), stackresult.begin(), stackresult.end());
                                ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient);
+                               mode_junk.erase(mode_junk.begin() + 1, mode_junk.end());
                        }
                }
        }

diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index a589d5c71df0c7cd6f3653e2bec95e0e5dfe8c3e..2269f24216ddb5de6a6d6467a9e8b3c0049b08c1 100644 (file)
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -240,12 +240,9 @@ class ModuleBanRedirect : public Module
 
                                while(modestack.GetStackedLine(stackresult))
                                {
-                                       for(StringDeque::size_type i = 0; i < stackresult.size(); i++)
-                                       {
-                                               mode_junk.push_back(stackresult[i]);
-                                       }
-
+                                       mode_junk.insert(mode_junk.end(), stackresult.begin(), stackresult.end());
                                        ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient);
+                                       mode_junk.erase(mode_junk.begin() + 1, mode_junk.end());
                                }
 
                                delete redirects;

diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp
index ca331b0cf9170bab9a9ef2fe521a687e70ac6468..65bd2eed1243ebdc6004439012170cbd318f211a 100644 (file)
--- a/src/modules/m_chanprotect.cpp
+++ b/src/modules/m_chanprotect.cpp
@@ -88,11 +88,9 @@ class FounderProtectBase
 
                while (modestack.GetStackedLine(stackresult))
                {
-                       for (size_t j = 0; j < stackresult.size(); j++)
-                       {
-                               mode_junk.push_back(stackresult[j]);
-                       }
+                       mode_junk.insert(mode_junk.end(), stackresult.begin(), stackresult.end());
                        MyInstance->SendMode(mode_junk, MyInstance->FakeClient);
+                       mode_junk.erase(mode_junk.begin() + 1, mode_junk.end());
                }
        }
 

diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index e2656a694e0419445fab4e3ef340d48fa5c61e93..b9bd79f18764089a708157782d14c569eb2ff2c0 100644 (file)
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -187,11 +187,9 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque<std::string> &p
 
                while (modestack.GetStackedLine(stackresult))
                {
-                       for (size_t j = 0; j < stackresult.size(); j++)
-                       {
-                               mode_junk.push_back(stackresult[j]);
-                       }
+                       mode_junk.insert(mode_junk.end(), stackresult.begin(), stackresult.end());
                        ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient);
+                       mode_junk.erase(mode_junk.begin() + 1, mode_junk.end());
                }
        }
 
@@ -226,10 +224,9 @@ bool TreeSocket::RemoveStatus(const std::string &prefix, std::deque<std::string>
 
                while (stack.GetStackedLine(stackresult))
                {
-                       for (size_t j = 0; j < stackresult.size(); j++)
-                               mode_junk.push_back(stackresult[j]);
-
+                       mode_junk.insert(mode_junk.end(), stackresult.begin(), stackresult.end());
                        ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient);
+                       mode_junk.erase(mode_junk.begin() + 1, mode_junk.end());
                }
        }
        return true;