X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=ddb6a573c0dad0532ed314662467c390f69e5b29;hb=fc09ab48fbdbbe77b63ce30e051b3118eb006f0b;hp=6ee703ea585d834cf67933889fa7e8c7f6403c69;hpb=28a0f6a51155905b5abe380adda5e5d2bddcf755;p=xestiaab%2F.git diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp index 6ee703e..ddb6a57 100644 --- a/source/contacteditor/ContactDataObject.cpp +++ b/source/contacteditor/ContactDataObject.cpp @@ -5158,6 +5158,28 @@ void ContactDataObject::ProcessVendor(wxString PropertySeg1, wxString PropertySe } +void ProcessTokens(wxString *PropertyName, + wxString *PropertyValue, + wxString *PropertyTokens, + bool FirstToken){ + + if (!PropertyName->IsEmpty() && !PropertyValue->IsEmpty() && *PropertyName != wxT("TYPE")){ + + if (FirstToken == TRUE){ + + PropertyTokens->Append(*PropertyName + wxT("=") + *PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens->Append(wxT(";") + *PropertyName + wxT("=") + *PropertyValue); + + } + + } + +} + void ProcessStringValue(wxString *PropertyName, wxString PropertyNameMatch, std::map *MapPtr, @@ -5206,30 +5228,6 @@ void ProcessIntegerValue(wxString *PropertyName, } -void ProcessIntegerValue(std::map *PrefPtr, - wxString *PropertyValue, - int *ItemCount){ - - int PriorityNumber = 0; - bool ValidNumber = TRUE; - - try{ - PriorityNumber = std::stoi(PropertyValue->ToStdString()); - } - - catch(std::invalid_argument &e){ - ValidNumber = FALSE; - } - - if (ValidNumber == TRUE){ - - PrefPtr->erase(*ItemCount); - PrefPtr->insert(std::make_pair(*ItemCount, PriorityNumber)); - - } - -} - void SplitValues(wxString *PropertyLine, std::map *SplitPoints, std::map *SplitLength,