X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=9d9434da54910655ff5f8d9b631118cf905bf500;hb=a9732b2e5e886a809474255e835f2a50437cb4d0;hp=6247596bd22c3bdf3c92961822084f415326efbb;hpb=7d729a4ae2a2f9255de6ea3babe3d5ee983fd1fd;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 6247596..9d9434d 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -3575,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);
@@ -3758,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);
@@ -3932,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);
@@ -4077,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);
@@ -4366,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")){
 		
@@ -4583,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")){
 		
@@ -4800,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")){