From a9732b2e5e886a809474255e835f2a50437cb4d0 Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Mon, 28 Dec 2015 02:31:43 +0000 Subject: [PATCH] Replaced the PREF code in LOGO and SOUND with ProcessIntegerValue. --- source/contacteditor/ContactDataObject.cpp | 36 ++-------------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp index 55cce69..9d9434d 100644 --- 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")){ -- 2.39.5