First pass at refactoring the pathfinding linksets and pathfinding characters classes to reduce code duplication, as both functionalities were heavily duplicated.

1 files changed, 21 insertions, 16 deletions

diff --git a/indra/newview/llpathfindingcharacterlist.cpp b/indra/newview/llpathfindingcharacterlist.cpp
index 5ab4a8910f..53b21f436d 100644
--- a/indra/newview/llpathfindingcharacterlist.cpp
+++ b/indra/newview/llpathfindingcharacterlist.cpp
@@ -27,37 +27,42 @@
 
 #include "llviewerprecompiledheaders.h"
 
-#include <string>
-#include <map>
+#include "llpathfindingcharacterlist.h"
 
 #include "llsd.h"
-#include "lluuid.h"
 #include "llpathfindingcharacter.h"
-#include "llpathfindingcharacterlist.h"
+#include "llpathfindingobject.h"
+#include "llpathfindingobjectlist.h"
 
 //---------------------------------------------------------------------------
 // LLPathfindingCharacterList
 //---------------------------------------------------------------------------
 
 LLPathfindingCharacterList::LLPathfindingCharacterList()
-	: LLPathfindingCharacterMap()
+	: LLPathfindingObjectList()
 {
 }
 
-LLPathfindingCharacterList::LLPathfindingCharacterList(const LLSD& pCharacterItems)
-	: LLPathfindingCharacterMap()
+LLPathfindingCharacterList::LLPathfindingCharacterList(const LLSD& pCharacterListData)
+	: LLPathfindingObjectList()
 {
-	for (LLSD::map_const_iterator characterItemIter = pCharacterItems.beginMap();
-		characterItemIter != pCharacterItems.endMap(); ++characterItemIter)
-	{
-		const std::string& uuid(characterItemIter->first);
-		const LLSD& characterData = characterItemIter->second;
-		LLPathfindingCharacterPtr character(new LLPathfindingCharacter(uuid, characterData));
-		insert(std::pair<std::string, LLPathfindingCharacterPtr>(uuid, character));
-	}
+	parseCharacterListData(pCharacterListData);
 }
 
 LLPathfindingCharacterList::~LLPathfindingCharacterList()
 {
-	clear();
+}
+
+void LLPathfindingCharacterList::parseCharacterListData(const LLSD& pCharacterListData)
+{
+	LLPathfindingObjectMap &objectMap = getObjectMap();
+
+	for (LLSD::map_const_iterator characterDataIter = pCharacterListData.beginMap();
+		characterDataIter != pCharacterListData.endMap(); ++characterDataIter)
+	{
+		const std::string& uuid(characterDataIter->first);
+		const LLSD& characterData = characterDataIter->second;
+		LLPathfindingObjectPtr character(new LLPathfindingCharacter(uuid, characterData));
+		objectMap.insert(std::pair<std::string, LLPathfindingObjectPtr>(uuid, character));
+	}
 }