From d5d6f0d5c37cf6040b90c83f7dfb34bedcd235e3 Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Mon, 28 Dec 2015 04:25:13 +0000 Subject: [PATCH] Replaced string processing in TEL with ProcessStringValue. --- source/contacteditor/ContactDataObject.cpp | 41 ++++++++++------------ 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp index 0668659..b71c1f3 100644 --- a/source/contacteditor/ContactDataObject.cpp +++ b/source/contacteditor/ContactDataObject.cpp @@ -2470,6 +2470,8 @@ void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString Propert intPrevValue = 4; + bool PropertyMatched = FALSE; + for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -2487,34 +2489,27 @@ void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString Propert // Process properties. - if (PropertyName == wxT("ALTID")){ - - TelephoneListAltID->erase(*TelephoneCount); - TelephoneListAltID->insert(std::make_pair(*TelephoneCount, PropertyValue)); + ProcessStringValue(&PropertyName, "ALTID", TelephoneListAltID, &PropertyValue, TelephoneCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "PID", TelephoneListPID, &PropertyValue, TelephoneCount, &PropertyMatched); + ProcessIntegerValue(&PropertyName, "PREF", TelephoneListPref, &PropertyValue, TelephoneCount, &PropertyMatched); - } else if (PropertyName == wxT("PID")){ - - TelephoneListPID->erase(*TelephoneCount); - TelephoneListPID->insert(std::make_pair(*TelephoneCount, PropertyValue)); + if (PropertyMatched == TRUE){ - } else if (PropertyName == wxT("PREF")){ - - ProcessIntegerValue(TelephoneListPref, &PropertyValue, TelephoneCount); + PropertyMatched = FALSE; + continue; - } else { + } + + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ - if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + if (FirstToken == TRUE){ - if (FirstToken == TRUE){ - - PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); - FirstToken = FALSE; - - } else { - - PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); - - } + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); } -- 2.39.5