X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=23c53f3999116a01fe7332b5962439067289d744;hb=0a749c36a873e196f41a5f8c7da3f09592bf24fb;hp=532884d171e64bba9211d6ff1ba02bd469cfa716;hpb=772e3145d141c511dcdcffbc59158a28aa4c3901;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 532884d..23c53f3 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -611,24 +611,8 @@ void ContactDataObject::ProcessSource(wxString PropertySeg1, wxString PropertySe
 		
 		} else if (PropertyName == wxT("PREF")){
 			
-			int PriorityNumber = 0;
-			bool ValidNumber = TRUE;
-			
-			try{
-				PriorityNumber = std::stoi(PropertyValue.ToStdString());
-			}
-			
-			catch(std::invalid_argument &e){
-				ValidNumber = FALSE;
-			}
-
-			if (ValidNumber == TRUE){
+			ProcessIntegerValue(this, &SourceListPref, &PropertyValue, SourceCount);
 
-				SourceListPref.erase(*SourceCount);
-				SourceListPref.insert(std::make_pair(*SourceCount, PriorityNumber));
-
-			}
-		
 		} else if (PropertyName == wxT("MEDIATYPE")){
 		
 			SourceListMediatype.erase(*SourceCount);
@@ -785,23 +769,7 @@ void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySe
 		
 		} else if (PropertyName == wxT("PREF")){
 
-			int PriorityNumber = 0;
-			bool ValidNumber = TRUE;
-			
-			try{
-				PriorityNumber = std::stoi(PropertyValue.ToStdString());
-			}
-			
-			catch(std::invalid_argument &e){
-				ValidNumber = FALSE;
-			}
-
-			if (ValidNumber == TRUE){
-
-				GroupsListPref.erase(*GroupCount);
-				GroupsListPref.insert(std::make_pair(*GroupCount, PriorityNumber));
-		
-			}
+			ProcessIntegerValue(this, &GroupsListPref, &PropertyValue, GroupCount);
 		
 		} else if (PropertyName == wxT("MEDIATYPE")){
 
@@ -898,23 +866,7 @@ void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2,
 		
 		} else if (PropertyName == wxT("PREF")){
 
-			int PriorityNumber = 0;
-			bool ValidNumber = TRUE;
-			
-			try{
-				PriorityNumber = std::stoi(PropertyValue.ToStdString());
-			}
-			
-			catch(std::invalid_argument &e){
-				ValidNumber = FALSE;
-			}
-
-			if (ValidNumber == TRUE){
-
-				FullNamesListPref.erase(*FNCount);
-				FullNamesListPref.insert(std::make_pair(*FNCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, &FullNamesListPref, &PropertyValue, FNCount);
 		
 		} else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
 			
@@ -1274,23 +1226,7 @@ void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString Property
 
 		} else if (PropertyName == wxT("PREF")){
 
-			int PriorityNumber = 0;
-			bool ValidNumber = TRUE;
-			
-			try{
-				PriorityNumber = std::stoi(PropertyValue.ToStdString());
-			}
-			
-			catch(std::invalid_argument &e){
-				ValidNumber = FALSE;
-			}
-
-			if (ValidNumber == TRUE){
-
-				NicknamesListPref->erase(*NicknameCount);
-				NicknamesListPref->insert(std::make_pair(*NicknameCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, NicknamesListPref, &PropertyValue, NicknameCount);
 		
 		} else if (PropertyName == wxT("LANGUAGE")){
 
@@ -1765,23 +1701,7 @@ void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString Property
 
 		} else if (PropertyName == wxT("PREF")){
 
-			int PriorityNumber = 0;
-			bool ValidNumber = TRUE;
-			
-			try{
-				PriorityNumber = std::stoi(PropertyValue.ToStdString());
-			}
-			
-			catch(std::invalid_argument &e){
-				ValidNumber = FALSE;
-			}
-
-			if (ValidNumber == TRUE){
-
-				TZListPref->erase(*TimeZoneCount);
-				TZListPref->insert(std::make_pair(*TimeZoneCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, TZListPref, &PropertyValue, TimeZoneCount);
 		
 		} else if (PropertyName == wxT("MEDIATYPE")){
 
@@ -1997,24 +1917,8 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
 			AddressListMediatype->insert(std::make_pair(*AddressCount, PropertyValue));
 		
 		} else if (PropertyName == wxT("PREF")){
-			
-			int PriorityNumber = 0;
-			bool ValidNumber = TRUE;
-			
-			try{
-				PriorityNumber = std::stoi(PropertyValue.ToStdString());
-			}
-			
-			catch(std::invalid_argument &e){
-				ValidNumber = FALSE;
-			}
 
-			if (ValidNumber == TRUE){
-
-				AddressListPref->erase(*AddressCount);
-				AddressListPref->insert(std::make_pair(*AddressCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, AddressListPref, &PropertyValue, AddressCount);
 		
 		} else {
 		
@@ -2279,23 +2183,7 @@ void ContactDataObject::ProcessEmail(wxString PropertySeg1, wxString PropertySeg
 		
 		} else if (PropertyName == wxT("PREF")){
 			
-			int PriorityNumber = 0;
-			bool ValidNumber = TRUE;
-			
-			try{
-				PriorityNumber = std::stoi(PropertyValue.ToStdString());
-			}
-			
-			catch(std::invalid_argument &e){
-				ValidNumber = FALSE;
-			}
-
-			if (ValidNumber == TRUE){
-
-				EmailListPref->erase(*EmailCount);
-				EmailListPref->insert(std::make_pair(*EmailCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, EmailListPref, &PropertyValue, EmailCount);
 		
 		} else {
 		
@@ -2430,23 +2318,7 @@ void ContactDataObject::ProcessIM(wxString PropertySeg1, wxString PropertySeg2,
 		
 		} else if (PropertyName == wxT("PREF")){
 			
-			int PriorityNumber = 0;
-			bool ValidNumber = TRUE;
-			
-			try{
-				PriorityNumber = std::stoi(PropertyValue.ToStdString());
-			}
-			
-			catch(std::invalid_argument &e){
-				ValidNumber = FALSE;
-			}
-
-			if (ValidNumber == TRUE){
-
-				IMListPref->erase(*IMCount);
-				IMListPref->insert(std::make_pair(*IMCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, IMListPref, &PropertyValue, IMCount);
 		
 		} else {
 		
@@ -5878,9 +5750,9 @@ void ContactDataObject::ProcessVendor(wxString PropertySeg1, wxString PropertySe
 }
 
 void ProcessIntegerValue(ContactDataObject *ContactData,
-	std::map<int,int> *KeyListPref, 
+	std::map<int,int> *PrefPtr, 
 	wxString *PropertyValue, 
-	int *KeyCount){
+	int *ItemCount){
 
 	int PriorityNumber = 0;	
 	bool ValidNumber = TRUE;
@@ -5895,8 +5767,8 @@ void ProcessIntegerValue(ContactDataObject *ContactData,
 
 	if (ValidNumber == TRUE){
 
-		KeyListPref->erase(*KeyCount);
-		KeyListPref->insert(std::make_pair(*KeyCount, PriorityNumber));
+		PrefPtr->erase(*ItemCount);
+		PrefPtr->insert(std::make_pair(*ItemCount, PriorityNumber));
 
 	}