X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fchoicecondition.h;h=df4dacfd5c3e10f5e78abf9ad558f3e2e73a3b37;hb=d0663f70ea5caea2db3c6d3c846ec67410db3498;hp=5a453290d2315387cdaae76debd9d86cd8144322;hpb=fc27eb63c05d915d606e17992ecd5b7f68478101;p=poefilter.git

diff --git a/source/choicecondition.h b/source/choicecondition.h
index 5a45329..df4dacf 100644
--- a/source/choicecondition.h
+++ b/source/choicecondition.h
@@ -20,7 +20,7 @@ public:
 	virtual Condition *clone() const;
 	virtual bool can_merge(const Condition &, const CompoundCondition &) const;
 	virtual void add_lines(std::list<FilterStatement> &) const;
-	virtual void add_merged_lines(const std::list<Condition *> &, const CompoundCondition &, std::list<FilterStatement> &) const;
+	virtual void add_merged_lines(const std::vector<Condition *> &, const CompoundCondition &, std::list<FilterStatement> &) const;
 };
 
 
@@ -67,12 +67,12 @@ void ChoiceCondition<Traits>::add_lines(std::list<FilterStatement> &st) const
 }
 
 template<typename Traits>
-void ChoiceCondition<Traits>::add_merged_lines(const std::list<Condition *> &conditions, const CompoundCondition &parent, std::list<FilterStatement> &st) const
+void ChoiceCondition<Traits>::add_merged_lines(const std::vector<Condition *> &conditions, const CompoundCondition &parent, std::list<FilterStatement> &st) const
 {
 	if(dynamic_cast<const OrCondition *>(&parent))
 	{
 		std::string line = Traits::get_keyword();
-		for(std::list<Condition *>::const_iterator i=conditions.begin(); i!=conditions.end(); ++i)
+		for(std::vector<Condition *>::const_iterator i=conditions.begin(); i!=conditions.end(); ++i)
 			line += Msp::format(" \"%s\"", static_cast<const ChoiceCondition<Traits> *>(*i)->value);
 		FilterStatement::add_line(st, line);
 	}