Replaced PREF code in IMPP for ProcessIntegerValue.

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

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index f6a3da2..23c53f3 100644 (file)
--- 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 {