From 316f37a9f740acbce931cb735b662a2e46741583 Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Mon, 28 Dec 2015 05:10:59 +0000 Subject: [PATCH] Replaced string processing in CALADRURI with ProcessStringValue. --- source/contacteditor/ContactDataObject.cpp | 45 ++++++++-------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp index ad75ee3..a4339f6 100644 --- a/source/contacteditor/ContactDataObject.cpp +++ b/source/contacteditor/ContactDataObject.cpp @@ -4703,6 +4703,7 @@ void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxStrin CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); intPrevValue = 7; + bool PropertyMatched = FALSE; for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -4736,42 +4737,28 @@ void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxStrin CaptureString(&PropertyValue, FALSE); - if (PropertyName == wxT("ALTID")){ - - CalendarRequestListAltID.erase(*CalAdrURICount); - CalendarRequestListAltID.insert(std::make_pair(*CalAdrURICount, PropertyValue)); + ProcessStringValue(&PropertyName, "ALTID", &CalendarRequestListAltID, &PropertyValue, CalAdrURICount, &PropertyMatched); + ProcessStringValue(&PropertyName, "PID", &CalendarRequestListPID, &PropertyValue, CalAdrURICount, &PropertyMatched); + ProcessStringValue(&PropertyName, "MEDIATYPE", &CalendarRequestListMediatype, &PropertyValue, CalAdrURICount, &PropertyMatched); + ProcessIntegerValue(&PropertyName, "PREF", &CalendarRequestListPref, &PropertyValue, CalAdrURICount, &PropertyMatched); - } else if (PropertyName == wxT("PID")){ - - CalendarRequestListPID.erase(*CalAdrURICount); - CalendarRequestListPID.insert(std::make_pair(*CalAdrURICount, PropertyValue)); - - } else if (PropertyName == wxT("PREF")){ - - ProcessIntegerValue(&CalendarRequestListPref, &PropertyValue, CalAdrURICount); + if (PropertyMatched == TRUE){ - } else if (PropertyName == wxT("MEDIATYPE")){ + PropertyMatched = FALSE; + continue; - CalendarRequestListMediatype.erase(*CalAdrURICount); - CalendarRequestListMediatype.insert(std::make_pair(*CalAdrURICount, PropertyValue)); + } - } else { + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ - // Something else we don't know about so append - // to the tokens variable. + if (FirstToken == TRUE){ - if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; - if (FirstToken == TRUE){ - - PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); - FirstToken = FALSE; - - } else { - - PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); - - } + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); } -- 2.39.5