X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=1acc7f9626090b2d6795b2fb196df2eb5eb7763e;hb=61ae72f92285e9b558927e2f64403a243a3290b4;hp=f6a3da2d3fe464fd2316b82929b0858885098a4c;hpb=9d51c004d7508cdb1caee7f3faa953247c8a0867;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index f6a3da2..1acc7f9 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -1917,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 {
 		
@@ -2199,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 {
 		
@@ -2350,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 {
 		
@@ -2659,24 +2611,8 @@ void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString Propert
 			TelephoneListPID->insert(std::make_pair(*TelephoneCount, 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){
-
-				TelephoneListPref->erase(*TelephoneCount);
-				TelephoneListPref->insert(std::make_pair(*TelephoneCount, PriorityNumber));
 
-			}
+			ProcessIntegerValue(this, TelephoneListPref, &PropertyValue, TelephoneCount);
 		
 		} else {
 		
@@ -2802,23 +2738,7 @@ void ContactDataObject::ProcessLanguage(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){
-
-				LanguageListPref->erase(*LanguageCount);
-				LanguageListPref->insert(std::make_pair(*LanguageCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, LanguageListPref, &PropertyValue, LanguageCount);
 		
 		} else {
 		
@@ -2951,24 +2871,8 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper
 			GeopositionListMediatype->insert(std::make_pair(*GeographicCount, 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){
-
-				GeopositionListPref->erase(*GeographicCount);
-				GeopositionListPref->insert(std::make_pair(*GeographicCount, PriorityNumber));
 
-			}
+			ProcessIntegerValue(this, GeopositionListPref, &PropertyValue, GeographicCount);
 		
 		} else {
 		
@@ -3203,9 +3107,8 @@ void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertyS
 			}
 		
 		} else if (PropertyName == wxT("LANGUAGE")){
-		
-			GeneralRelatedListLanguage.erase(*RelatedCount);
-			GeneralRelatedListLanguage.insert(std::make_pair(*RelatedCount, PropertyValue));
+
+			ProcessIntegerValue(this, &GeneralRelatedListPref, &PropertyValue, RelatedCount);
 		
 		} else if (PropertyName != wxT("TYPE")) {
 		
@@ -3356,25 +3259,9 @@ void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2,
 			WebsiteListPID->insert(std::make_pair(*URLCount, 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){
-
-				WebsiteListPref->erase(*URLCount);
-				WebsiteListPref->insert(std::make_pair(*URLCount, PriorityNumber));
-
-			}
-					
+			ProcessIntegerValue(this, WebsiteListPref, &PropertyValue, URLCount);
+							
 		} else if (PropertyName == wxT("MEDIATYPE")){
 		
 			WebsiteListMediatype->erase(*URLCount);
@@ -3530,25 +3417,9 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg
 			TitleListPID->insert(std::make_pair(*TitleCount, 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){
-
-				TitleListPref->erase(*TitleCount);
-				TitleListPref->insert(std::make_pair(*TitleCount, PriorityNumber));
-
-			}
-					
+			ProcessIntegerValue(this, TitleListPref, &PropertyValue, TitleCount);
+			
 		} else if (PropertyName == wxT("LANGUAGE")){
 		
 			TitleListLanguage->erase(*TitleCount);
@@ -3704,25 +3575,9 @@ void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2
 			RoleListPID->insert(std::make_pair(*RoleCount, 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){
-
-				RoleListPref->erase(*RoleCount);
-				RoleListPref->insert(std::make_pair(*RoleCount, PriorityNumber));
 
-			}
-					
+			ProcessIntegerValue(this, RoleListPref, &PropertyValue, RoleCount);
+				
 		} else if (PropertyName == wxT("LANGUAGE")){
 		
 			RoleListLanguage->erase(*RoleCount);
@@ -3887,25 +3742,9 @@ void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString Prop
 			OrganisationsListSortAs->insert(std::make_pair(*OrganisationCount, 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){
 
-				OrganisationsListPref->erase(*OrganisationCount);
-				OrganisationsListPref->insert(std::make_pair(*OrganisationCount, PriorityNumber));
-
-			}
-					
+			ProcessIntegerValue(this, OrganisationsListPref, &PropertyValue, OrganisationCount);
+			
 		} else if (PropertyName == wxT("LANGUAGE")){
 		
 			OrganisationsListLanguage->erase(*OrganisationCount);
@@ -4061,25 +3900,9 @@ void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2
 			NoteListPID->insert(std::make_pair(*NoteCount, 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){
-
-				NoteListPref->erase(*NoteCount);
-				NoteListPref->insert(std::make_pair(*NoteCount, PriorityNumber));
 
-			}
-					
+			ProcessIntegerValue(this, NoteListPref, &PropertyValue, NoteCount);
+		
 		} else if (PropertyName == wxT("LANGUAGE")){
 		
 			NoteListLanguage->erase(*NoteCount);
@@ -4206,25 +4029,9 @@ void ContactDataObject::ProcessCategory(wxString PropertySeg1, wxString Property
 			CategoriesListPID.insert(std::make_pair(*CategoryCount, 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){
 
-				CategoriesListPref.erase(*CategoryCount);
-				CategoriesListPref.insert(std::make_pair(*CategoryCount, PriorityNumber));
-
-			}
-					
+			ProcessIntegerValue(this, &CategoriesListPref, &PropertyValue, CategoryCount);
+			
 		} else if (PropertyName == wxT("LANGUAGE")){
 		
 			CategoriesListLanguage.erase(*CategoryCount);
@@ -4495,24 +4302,8 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg
 			PicturesListPID.insert(std::make_pair(*PhotoCount, 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){
-
-				PicturesListPref.erase(*PhotoCount);
-				PicturesListPref.insert(std::make_pair(*PhotoCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, &PicturesListPref, &PropertyValue, PhotoCount);
 		
 		} else if (PropertyName == wxT("MEDIATYPE")){
 		
@@ -4712,24 +4503,8 @@ void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2
 			LogosListPID.insert(std::make_pair(*LogoCount, 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){
 
-				LogosListPref.erase(*LogoCount);
-				LogosListPref.insert(std::make_pair(*LogoCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, &LogosListPref, &PropertyValue, LogoCount);
 		
 		} else if (PropertyName == wxT("MEDIATYPE")){
 		
@@ -4929,24 +4704,8 @@ void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg
 			SoundsListPID.insert(std::make_pair(*SoundCount, 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){
-
-				SoundsListPref.erase(*SoundCount);
-				SoundsListPref.insert(std::make_pair(*SoundCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, &SoundsListPref, &PropertyValue, SoundCount);
 		
 		} else if (PropertyName == wxT("MEDIATYPE")){
 		
@@ -5151,24 +4910,8 @@ void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope
 			CalendarListPID.insert(std::make_pair(*CalURICount, 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){
 
-				CalendarListPref.erase(*CalURICount);
-				CalendarListPref.insert(std::make_pair(*CalURICount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, &CalendarListPref, &PropertyValue, CalURICount);
 		
 		} else if (PropertyName == wxT("MEDIATYPE")){
 		
@@ -5303,24 +5046,8 @@ void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxStrin
 			CalendarRequestListPID.insert(std::make_pair(*CalAdrURICount, 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){
 
-				CalendarRequestListPref.erase(*CalAdrURICount);
-				CalendarRequestListPref.insert(std::make_pair(*CalAdrURICount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, &CalendarRequestListPref, &PropertyValue, CalAdrURICount);
 		
 		} else if (PropertyName == wxT("MEDIATYPE")){
 		
@@ -5455,24 +5182,8 @@ void ContactDataObject::ProcessCalendarFreeBusy(wxString PropertySeg1, wxString
 			FreeBusyListPID.insert(std::make_pair(*FreeBusyAddressCount, 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){
-
-				FreeBusyListPref.erase(*FreeBusyAddressCount);
-				FreeBusyListPref.insert(std::make_pair(*FreeBusyAddressCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, &FreeBusyListPref, &PropertyValue, FreeBusyAddressCount);
 		
 		} else if (PropertyName == wxT("MEDIATYPE")){