From 28a0f6a51155905b5abe380adda5e5d2bddcf755 Mon Sep 17 00:00:00 2001
From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Mon, 28 Dec 2015 05:18:08 +0000
Subject: [PATCH] Replaced string processing in KEY with ProcessStringValue.

---
 source/contacteditor/ContactDataObject.cpp | 43 +++++++++-------------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 8467edf..6ee703e 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -4950,6 +4950,7 @@ void ContactDataObject::ProcessKey(wxString PropertySeg1, wxString PropertySeg2,
 	CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
 
 	intPrevValue = 4;
+	bool PropertyMatched = FALSE;
 
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -4979,39 +4980,29 @@ void ContactDataObject::ProcessKey(wxString PropertySeg1, wxString PropertySeg2,
 			
 			PropertyValue.Remove(0, 1);
 			
-		}				
+		}
 		
-		if (PropertyName == wxT("ALTID")){
-
-			KeyListAltID.erase(*KeyCount);
-			KeyListAltID.insert(std::make_pair(*KeyCount, PropertyValue));
+		ProcessStringValue(&PropertyName, "ALTID", &KeyListAltID, &PropertyValue, KeyCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", &KeyListPID, &PropertyValue, KeyCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", &KeyListPref, &PropertyValue, KeyCount, &PropertyMatched);
 		
-		} else if (PropertyName == wxT("PID")){
-
-			KeyListPID.erase(*KeyCount);
-			KeyListPID.insert(std::make_pair(*KeyCount, PropertyValue));
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(&KeyListPref, &PropertyValue, KeyCount);
+			PropertyMatched = FALSE;
+			continue;
 		
-		} else {
+		}
+
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
+			if (FirstToken == TRUE){
 			
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
 			
-				if (FirstToken == TRUE){
-				
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-				
-				} else {
-				
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-				}
+			} else {
+			
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 			
 			}
 		
-- 
2.39.5