From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Mon, 28 Dec 2015 05:32:17 +0000 (+0000)
Subject: Replaced token processing in MEMBER with ProcessTokens.
X-Git-Tag: release-0.09~154
X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=5d5a86eb762ea0ed686eec3098b2d378cfab15f9;p=xestiaab%2F.git

Replaced token processing in MEMBER with ProcessTokens.
---

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 44a361d..b7a59e2 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -603,20 +603,7 @@ void ContactDataObject::ProcessSource(wxString PropertySeg1, wxString PropertySe
 		
 		}
 		
-		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
-			
-			if (FirstToken == TRUE){
-				
-				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-				FirstToken = FALSE;
-			
-			} else {
-			
-				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-			
-			}
-		
-		}
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}	
 	
@@ -751,20 +738,7 @@ void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySe
 		
 		}
 		
-		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
-			
-			if (FirstToken == TRUE){
-				
-				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-				FirstToken = FALSE;
-				
-			} else {
-			
-				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-			}
-			
-		}
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 		
 	}