X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fchoicecondition.h;h=9792f64c42f012963933b794ca09cba09acee6c7;hb=8dcb2ed5219429c1c7d543c422a7471c18917f55;hp=91b5e71aa5e58bbc22ead2df8cf8a54bbc7ca7b8;hpb=f3d3b7227de162f824b8be6be4028a8848f11f2f;p=poefilter.git

diff --git a/source/choicecondition.h b/source/choicecondition.h
index 91b5e71..9792f64 100644
--- a/source/choicecondition.h
+++ b/source/choicecondition.h
@@ -1,6 +1,7 @@
 #ifndef CHOICECONDITION_H_
 #define CHOICECONDITION_H_
 
+#include <msp/core/algorithm.h>
 #include "condition.h"
 #include "filter.h"
 
@@ -20,7 +21,7 @@ public:
 
 	virtual ChoiceCondition<T> *clone() const;
 	virtual bool can_merge(const Condition &, const CompoundCondition &) const;
-	virtual ChoiceCondition<T> *merge(const std::vector<Condition *> &, const CompoundCondition &) const;
+	virtual ChoiceCondition<T> *merge(const std::vector<const Condition *> &, const CompoundCondition &) const;
 	virtual void add_lines(std::list<FilterStatement> &) const;
 };
 
@@ -67,18 +68,17 @@ bool ChoiceCondition<T>::can_merge(const Condition &other, const CompoundConditi
 }
 
 template<typename T>
-ChoiceCondition<T> *ChoiceCondition<T>::merge(const std::vector<Condition *> &conditions, const CompoundCondition &parent) const
+ChoiceCondition<T> *ChoiceCondition<T>::merge(const std::vector<const Condition *> &conditions, const CompoundCondition &parent) const
 {
 	if(dynamic_cast<const OrCondition *>(&parent) && !conditions.empty())
 	{
-		ChoiceCondition<T> *result = 0;
-		for(std::vector<Condition *>::const_iterator i=conditions.begin(); i!=conditions.end(); ++i)
+		ChoiceCondition<T> *result = new ChoiceCondition<T>(std::vector<Type>());
+		for(std::vector<const Condition *>::const_iterator i=conditions.begin(); i!=conditions.end(); ++i)
 		{
-			const std::vector<Type> &v = static_cast<ChoiceCondition<T> *>(*i)->values;
-			if(!result)
-				result = new ChoiceCondition<T>(v);
-			else
-				result->values.insert(result->values.end(), v.begin(), v.end());
+			const std::vector<Type> &v = static_cast<const ChoiceCondition<T> *>(*i)->values;
+			for(typename std::vector<Type>::const_iterator j=v.begin(); j!=v.end(); ++j)
+				if(Msp::find(result->values, *j)==result->values.end())
+					result->values.push_back(*j);
 		}
 		return result;
 	}