#5613: Entity KeyValue objects now hold a reference to the owning Spa…

…wnArgs instance. This is a preparation to notify the owner on Undo/Redo when just a single key value is being reverted to a previous state - right now the SpawnArgs owner doesn't get notified.

radiantcore/entity/KeyValue.cpp

@@ -6,15 +6,17 @@
 namespace entity 
 {
 
-KeyValue::KeyValue(const std::string& value, const std::string& empty) :
-	_value(value),
-	_emptyValue(empty),
-	_undo(_value, std::bind(&KeyValue::importState, this, std::placeholders::_1), "KeyValue")
+KeyValue::KeyValue(SpawnArgs& owner, const std::string& value, const std::string& empty) :
+    _owner(owner),
+    _value(value),
+    _emptyValue(empty),
+    _undo(_value, std::bind(&KeyValue::importState, this, std::placeholders::_1), "KeyValue")
 {
 	notify();
 }
 
-KeyValue::~KeyValue() {
+KeyValue::~KeyValue()
+{
 	assert(_observers.empty());
 }
 

radiantcore/entity/KeyValue.h

@@ -10,6 +10,8 @@
 namespace entity
 {
 
+class SpawnArgs;
+
 /// \brief A key/value pair of strings.
 ///
 /// - Notifies observers when value changes - value changes to "" on destruction.
@@ -19,6 +21,8 @@ class KeyValue :
 	public sigc::trackable
 {
 private:
+    SpawnArgs& _owner;
+
 	typedef std::vector<KeyObserver*> KeyObservers;
 	KeyObservers _observers;
 
@@ -29,7 +33,7 @@ class KeyValue :
 	sigc::connection _redoHandler;
 
 public:
-	KeyValue(const std::string& value, const std::string& empty);
+	KeyValue(SpawnArgs& owner, const std::string& value, const std::string& empty);
 
 	~KeyValue();
 

radiantcore/entity/SpawnArgs.cpp

@@ -285,44 +285,38 @@ void SpawnArgs::notifyErase(const std::string& key, KeyValue& value)
 void SpawnArgs::insert(const std::string& key, const KeyValuePtr& keyValue)
 {
 	// Insert the new key at the end of the list
-	KeyValues::iterator i = _keyValues.insert(
-		_keyValues.end(),
-		KeyValuePair(key, keyValue)
-	);
+	auto& pair = _keyValues.emplace_back(key, keyValue);
 
 	// Dereference the iterator to get a KeyValue& reference and notify the observers
-	notifyInsert(key, *i->second);
+	notifyInsert(key, *pair.second);
 
 	if (_instanced)
 	{
-		i->second->connectUndoSystem(_undo.getUndoChangeTracker());
+        pair.second->connectUndoSystem(_undo.getUndoChangeTracker());
 	}
 }
 
 void SpawnArgs::insert(const std::string& key, const std::string& value)
 {
 	// Try to lookup the key in the map
-	KeyValues::iterator i = find(key);
+    auto i = find(key);
 
-	if (i != _keyValues.end())
+    if (i != _keyValues.end())
     {
-		// Key has been found
-		i->second->assign(value);
+        // Key has been found
+        i->second->assign(value);
 
         // Notify observers of key change, using the found key as argument
-		// as the case of the incoming "key" might be different
+        // as the case of the incoming "key" might be different
         notifyChange(i->first, value);
-	}
+    }
 	else
 	{
 		// No key with that name found, create a new one
 		_undo.save();
 
 		// Allocate a new KeyValue object and insert it into the map
-		insert(
-			key,
-			KeyValuePtr(new KeyValue(value, _eclass->getAttribute(key).getValue()))
-		);
+		insert(key, std::make_shared<KeyValue>(*this, value, _eclass->getAttribute(key).getValue()));
 	}
 }