From 04fb2fa5eda7107d9f1d9bebef12a7ff2cbc5bcf Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Mon, 28 Dec 2015 02:18:09 +0000 Subject: [PATCH] Replaced the PREF code in ROLE with ProcessIntegerValue. --- source/contacteditor/ContactDataObject.cpp | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp index 6247596..3e800a8 100644 --- a/source/contacteditor/ContactDataObject.cpp +++ b/source/contacteditor/ContactDataObject.cpp @@ -3575,25 +3575,9 @@ void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2 RoleListPID->insert(std::make_pair(*RoleCount, 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){ - RoleListPref->erase(*RoleCount); - RoleListPref->insert(std::make_pair(*RoleCount, PriorityNumber)); - - } - + ProcessIntegerValue(this, RoleListPref, &PropertyValue, RoleCount); + } else if (PropertyName == wxT("LANGUAGE")){ RoleListLanguage->erase(*RoleCount); -- 2.39.5