Convert all list containers to vectors

[builder.git] / source / pattern.cpp

diff --git a/source/pattern.cpp b/source/pattern.cpp
index 51ca9c6f1c94830967ed1f7c2a5a210b9b20c243..fec83dad1f2273876e894b0c531aa39abacab984 100644 (file)
--- a/source/pattern.cpp
+++ b/source/pattern.cpp
@@ -17,15 +17,15 @@ string Pattern::apply(const string &body) const
        string result = body;
        if(body.compare(0, prefix.size(), prefix))
                result = prefix+result;
-       if(body.size()>suffix.size() && body.compare(body.size()-suffix.size(), suffix.size(), suffix))
+       if(body.size()<=suffix.size() || body.compare(body.size()-suffix.size(), suffix.size(), suffix))
                result += suffix;
        return result;
 }
 
-list<string> Pattern::apply_list(const list<Pattern> &patterns, const string &body)
+vector<string> Pattern::apply_list(const vector<Pattern> &patterns, const string &body)
 {
-       list<string> result;
-       for(list<Pattern>::const_iterator i=patterns.begin(); i!=patterns.end(); ++i)
-               result.push_back(i->apply(body));
+       vector<string> result;
+       for(const Pattern &p: patterns)
+               result.push_back(p.apply(body));
        return result;
 }