SimpleValueAction is no longer a template class, and is now used as base for...

SimpleValueAction is no longer a template class, and is now used as base for MultipleChoiceValueAction and TextValueAction.

src/data/action/value.cpp

@@ -38,73 +38,45 @@ void ValueAction::isOnCard(Card* card) {
 
 // ----------------------------------------------------------------------------- : Simple
 
-/// Swap the value in a Value object with a new one
-inline void swap_value(Value& a, ScriptValueP& b) { swap(a.value,    b); }
-
-/// A ValueAction that swaps between old and new values
-template <typename T, bool ALLOW_MERGE>
-class SimpleValueAction : public ValueAction {
-  public:
-	inline SimpleValueAction(const intrusive_ptr<T>& value, const typename T::ValueType& new_value)
-		: ValueAction(value), new_value(new_value)
-	{}
-	
-	virtual void perform(bool to_undo) {
-		ValueAction::perform(to_undo);
-		swap_value(static_cast<T&>(*valueP), new_value);
-		valueP->onAction(*this, to_undo); // notify value
-	}
-	
-	virtual bool merge(const Action& action) {
-		if (!ALLOW_MERGE) return false;
-		TYPE_CASE(action, SimpleValueAction) {
-			if (action.valueP == valueP) {
-				// adjacent actions on the same value, discard the other one,
-				// because it only keeps an intermediate value
-				return true;
-			}
+void SimpleValueAction::perform(bool to_undo) {
+	ValueAction::perform(to_undo);
+	swap(valueP->value, new_value);
+	valueP->onAction(*this, to_undo); // notify value
+}
+
+bool SimpleValueAction::merge(const Action& action) {
+	if (!allow_merge) return false;
+	TYPE_CASE(action, SimpleValueAction) {
+		if (action.valueP == valueP) {
+			// adjacent actions on the same value, discard the other one,
+			// because it only keeps an intermediate value
+			return true;
 		}
-		return false;
 	}
-	
-  private:
-	typename T::ValueType new_value;
-};
-
-ValueAction* value_action(const ValueP& value, const ScriptValueP& new_value) { return new SimpleValueAction<Value,false>(value, new_value); }
+	return false;
+}
 
-// ----------------------------------------------------------------------------- : MultipleChoice
+ValueAction* value_action(const ValueP& value, const ScriptValueP& new_value) {
+	return new SimpleValueAction(value, new_value);
+}
 
 ValueAction* value_action(const MultipleChoiceValueP& value, const ScriptValueP& new_value, const String& last_change) {
 	return new MultipleChoiceValueAction(value,new_value,last_change);
 }
 
-// copy paste of SimpleValueAction :(
-// TODO: do this in a better way
-
-void MultipleChoiceValueAction::perform(bool to_undo) {
-	ValueAction::perform(to_undo);
-	swap_value(static_cast<MultipleChoiceValue&>(*valueP), new_value);
-	valueP->onAction(*this, to_undo); // notify value
-}
-
-
 // ----------------------------------------------------------------------------- : Text
 
 TextValueAction::TextValueAction(const TextValueP& value, size_t start, size_t end, size_t new_end, const ScriptValueP& new_value, const String& name)
-	: ValueAction(value)
+	: SimpleValueAction(value, new_value)
 	, selection_start(start), selection_end(end), new_selection_end(new_end)
-	, new_value(new_value)
 	, name(name)
 {}
 
 String TextValueAction::getName(bool to_undo) const { return name; }
 
 void TextValueAction::perform(bool to_undo) {
-	ValueAction::perform(to_undo);
-	swap_value(value(), new_value);
 	swap(selection_end, new_selection_end);
-	valueP->onAction(*this, to_undo); // notify value
+	SimpleValueAction::perform(to_undo);
 }
 
 bool TextValueAction::merge(const Action& action) {

src/data/action/value.hpp

@@ -52,20 +52,33 @@ class ValueAction : public Action {
 
 // ----------------------------------------------------------------------------- : Simple
 
+/// A ValueAction that swaps between old and new values
+class SimpleValueAction : public ValueAction {
+  public:
+	inline SimpleValueAction(const ValueP& value, const ScriptValueP& new_value, bool allow_merge = false)
+		: ValueAction(value), new_value(new_value), allow_merge(allow_merge)
+	{}
+	
+	virtual void perform(bool to_undo);
+	virtual bool merge(const Action& action);
+	
+  protected:
+	ScriptValueP new_value;
+	bool allow_merge;
+};
+
 /// Action that updates a Value to a new value
-ValueAction* value_action(const ValueP&            value, const ScriptValueP&        new_value);
+ValueAction* value_action(const ValueP& value, const ScriptValueP& new_value);
 ValueAction* value_action(const MultipleChoiceValueP& value, const ScriptValueP& new_value, const String& last_change);
 
 // ----------------------------------------------------------------------------- : MultipleChoice
 
-class MultipleChoiceValueAction : public ValueAction {
+class MultipleChoiceValueAction : public SimpleValueAction {
   public:
 	inline MultipleChoiceValueAction(const ValueP& value, const ScriptValueP& new_value, const String& changed_choice)
-		: ValueAction(value), changed_choice(changed_choice), new_value(new_value)
+		: SimpleValueAction(value, new_value), changed_choice(changed_choice)
 	{}
 	
-	virtual void perform(bool to_undo);
-	
 	const String changed_choice; ///< What choice was toggled by this action (if any)
   private:
 	ScriptValueP new_value;
@@ -74,7 +87,7 @@ class MultipleChoiceValueAction : public ValueAction {
 // ----------------------------------------------------------------------------- : Text
 
 /// An action that changes a TextValue
-class TextValueAction : public ValueAction {
+class TextValueAction : public SimpleValueAction {
   public:
 	TextValueAction(const TextValueP& value, size_t start, size_t end, size_t new_end, const ScriptValueP& new_value, const String& name);
 	
@@ -90,7 +103,6 @@ class TextValueAction : public ValueAction {
 	inline TextValue& value() const;
 	
 	size_t new_selection_end;
-	ScriptValueP new_value;
 	String name;
 };
 
@@ -117,28 +129,6 @@ class TextToggleReminderAction : public ValueAction {
 	Char old;    ///< Old value of the <kw- tag
 };
 
-// ----------------------------------------------------------------------------- : Replace all
-
-/// A TextValueAction without the start and end stuff
-class SimpleTextValueAction : public ValueAction {
-  public:
-	SimpleTextValueAction(const Card* card, const TextValueP& value, const Defaultable<String>& new_value);
-	virtual void perform(bool to_undo);
-	bool merge(const SimpleTextValueAction& action);
-  private:
-	Defaultable<String> new_value;
-};
-
-/// An action from "Replace All"; just a bunch of value actions performed in sequence
-class ReplaceAllAction : public Action {
-  public:
-	~ReplaceAllAction();
-	
-	virtual String getName(bool to_undo) const;
-	virtual void perform(bool to_undo);
-	
-	vector<SimpleTextValueAction> actions;
-};
 
 // ----------------------------------------------------------------------------- : Event