Replaced the PREF code in LOGO and SOUND with ProcessIntegerValue.

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 55cce69..9d9434d 100644 (file)
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -4503,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")){
                
@@ -4720,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")){