X-Git-Url: http://git.tdb.fi/?p=poefilter.git;a=blobdiff_plain;f=source%2Fchoicecondition.h;h=6e2954dbf04790ea6ebfb1a3530463880dcf2b93;hp=df4dacfd5c3e10f5e78abf9ad558f3e2e73a3b37;hb=715006802a65fa5f541f2f4bcccbdd62d1a2bf09;hpb=980a6425ae617f403010b70e170805b755feb98f

diff --git a/source/choicecondition.h b/source/choicecondition.h
index df4dacf..6e2954d 100644
--- a/source/choicecondition.h
+++ b/source/choicecondition.h
@@ -42,32 +42,32 @@ struct BaseTypeTraits
 typedef ChoiceCondition<BaseTypeTraits> BaseTypeCondition;
 
 
-template<typename Traits>
-ChoiceCondition<Traits>::ChoiceCondition(Type v):
+template<typename T>
+ChoiceCondition<T>::ChoiceCondition(Type v):
 	value(v)
 { }
 
-template<typename Traits>
-Condition *ChoiceCondition<Traits>::clone() const
+template<typename T>
+Condition *ChoiceCondition<T>::clone() const
 {
-	return new ChoiceCondition<Traits>(value);
+	return new ChoiceCondition<T>(values);
 }
 
-template<typename Traits>
-bool ChoiceCondition<Traits>::can_merge(const Condition &other, const CompoundCondition &parent) const
+template<typename T>
+bool ChoiceCondition<T>::can_merge(const Condition &other, const CompoundCondition &parent) const
 {
-	return dynamic_cast<const ChoiceCondition<Traits> *>(&other) && dynamic_cast<const OrCondition *>(&parent);
+	return dynamic_cast<const ChoiceCondition<T> *>(&other) && dynamic_cast<const OrCondition *>(&parent);
 }
 
-template<typename Traits>
-void ChoiceCondition<Traits>::add_lines(std::list<FilterStatement> &st) const
+template<typename T>
+void ChoiceCondition<T>::add_lines(std::list<FilterStatement> &st) const
 {
 	const char *keyword = Traits::get_keyword();
 	FilterStatement::add_line(st, Msp::format("%s \"%s\"", keyword, value));
 }
 
-template<typename Traits>
-void ChoiceCondition<Traits>::add_merged_lines(const std::vector<Condition *> &conditions, const CompoundCondition &parent, std::list<FilterStatement> &st) const
+template<typename T>
+void ChoiceCondition<T>::add_merged_lines(const std::vector<Condition *> &conditions, const CompoundCondition &parent, std::list<FilterStatement> &st) const
 {
 	if(dynamic_cast<const OrCondition *>(&parent))
 	{