Replaced the PREF code in PHOTO with ProcessIntergerValue.

[xestiaab/.git] / source / contacteditor / ContactDataObject.cpp

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 0dbc421..55cce69 100644 (file)
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -4029,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);
@@ -4318,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")){