From f00ffba521c16d0f5419f60c0b4d362b362b76e6 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Mon, 1 Apr 2013 10:20:52 +0100 Subject: Purge references to the deprecated GetStackedLine method. --- include/hashcomp.h | 10 +--------- src/modules/m_banredirect.cpp | 3 +-- src/modules/m_customprefix.cpp | 2 +- src/modules/m_ojoin.cpp | 2 +- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/include/hashcomp.h b/include/hashcomp.h index 78d7ee878..b75214181 100644 --- a/include/hashcomp.h +++ b/include/hashcomp.h @@ -280,15 +280,7 @@ namespace irc * mode changes to be obtained. */ int GetStackedLine(std::vector &result, int max_line_size = 360); - - /** deprecated compatability interface - TODO remove */ - int GetStackedLine(std::deque &result, int max_line_size = 360) { - std::vector r; - int n = GetStackedLine(r, max_line_size); - result.clear(); - result.insert(result.end(), r.begin(), r.end()); - return n; - } + }; /** irc::tokenstream reads a string formatted as per RFC1459 and RFC2812. diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index 1a5126e61..512c9b64e 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -43,7 +43,6 @@ class BanRedirectEntry }; typedef std::vector BanRedirectList; -typedef std::deque StringDeque; class BanRedirect : public ModeWatcher { @@ -242,7 +241,7 @@ class ModuleBanRedirect : public Module if(redirects) { irc::modestacker modestack(false); - StringDeque stackresult; + std::vector stackresult; std::vector mode_junk; mode_junk.push_back(chan->name); diff --git a/src/modules/m_customprefix.cpp b/src/modules/m_customprefix.cpp index dfc60e082..9bf65b3e8 100644 --- a/src/modules/m_customprefix.cpp +++ b/src/modules/m_customprefix.cpp @@ -59,7 +59,7 @@ class CustomPrefixMode : public ModeHandler std::vector mode_junk; mode_junk.push_back(channel->name); irc::modestacker modestack(false); - std::deque stackresult; + std::vector stackresult; for (UserMembCIter i = cl->begin(); i != cl->end(); i++) { diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp index 207be2bb5..e2019e302 100644 --- a/src/modules/m_ojoin.cpp +++ b/src/modules/m_ojoin.cpp @@ -116,7 +116,7 @@ class NetworkPrefix : public ModeHandler std::vector mode_junk; mode_junk.push_back(channel->name); irc::modestacker modestack(false); - std::deque stackresult; + std::vector stackresult; for (UserMembCIter i = cl->begin(); i != cl->end(); i++) { -- cgit v1.2.3