Replaced the PREF code in FBURL with ProcessIntegerValue.

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

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 37d1361..1acc7f9 100644 (file)
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -4302,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")){
                
@@ -4519,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")){
                
@@ -4736,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")){
                
@@ -4958,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")){
                
@@ -5110,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")){
                
@@ -5262,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")){