X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=ae15502109f66d0c10f9f1b8c34fef2a27ddbb9b;hb=e872c31783158c4a2d4bcfe689faccd6e54b8779;hp=6ee703ea585d834cf67933889fa7e8c7f6403c69;hpb=28a0f6a51155905b5abe380adda5e5d2bddcf755;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 6ee703e..ae15502 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -511,17 +511,8 @@ void ContactDataObject::ProcessRevision(wxString PropertySeg1, wxString Property
 		}			
 		
 		CaptureString(&PropertyValue, FALSE);
-								
-		if (FirstToken == TRUE){
-				
-			PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-			FirstToken = FALSE;
-				
-		} else {
-				
-			PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-		}
+		
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}	
 	
@@ -612,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);
 	
 	}	
 	
@@ -760,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);
 		
 	}
 
@@ -850,20 +815,7 @@ void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2,
 		
 		}
 		
-		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);
 	
 	}
 
@@ -5158,6 +5110,28 @@ void ContactDataObject::ProcessVendor(wxString PropertySeg1, wxString PropertySe
 
 }
 
+void ProcessTokens(wxString *PropertyName,
+	wxString *PropertyValue,
+	wxString *PropertyTokens,
+	bool *FirstToken){
+	
+	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);
+			
+		}
+		
+	}
+	
+}
+
 void ProcessStringValue(wxString *PropertyName,
 	wxString PropertyNameMatch,
 	std::map<int,wxString> *MapPtr,
@@ -5206,30 +5180,6 @@ void ProcessIntegerValue(wxString *PropertyName,
 
 }
 
-void ProcessIntegerValue(std::map<int,int> *PrefPtr, 
-	wxString *PropertyValue, 
-	int *ItemCount){
-
-	int PriorityNumber = 0;	
-	bool ValidNumber = TRUE;
-			
-	try{
-		PriorityNumber = std::stoi(PropertyValue->ToStdString());
-	}
-			
-	catch(std::invalid_argument &e){
-		ValidNumber = FALSE;
-	}
-
-	if (ValidNumber == TRUE){
-
-		PrefPtr->erase(*ItemCount);
-		PrefPtr->insert(std::make_pair(*ItemCount, PriorityNumber));
-
-	}
-
-}
-
 void SplitValues(wxString *PropertyLine, 
 	std::map<int,int> *SplitPoints, 
 	std::map<int,int> *SplitLength,