X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fvcard%2Fvcard34conv-v4conv.cpp;h=f9a70ca3617733d54aa6cc7251158b6f793aff08;hb=ee9b71949005734012f18251774807c38b989ae2;hp=3e0ff06553e3d150778eb534e52a44655af87f3a;hpb=8119f1f7e95a62628e20418ad7d327b41efb20cb;p=xestiaab%2F.git diff --git a/source/vcard/vcard34conv-v4conv.cpp b/source/vcard/vcard34conv-v4conv.cpp index 3e0ff06..f9a70ca 100644 --- a/source/vcard/vcard34conv-v4conv.cpp +++ b/source/vcard/vcard34conv-v4conv.cpp @@ -57,21 +57,13 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ bool PropertyFind = TRUE; bool ExtraLineSeek = TRUE; bool ExtraLineSeekSub = TRUE; - bool BirthdayProcessed = FALSE; - bool AnniversaryProcessed = FALSE; - bool FNProcessed = FALSE; - bool GenderProcessed = FALSE; - bool NameProcessed = FALSE; bool FNFirst = FALSE; bool NicknameFirst = FALSE; bool TitleFirst = FALSE; bool OrganisationFirst = FALSE; bool NoteFirst = FALSE; bool PhotoFirst = FALSE; - bool LogoFirst = FALSE; - bool NameFirst = FALSE; bool FoundData = FALSE; - int intExtraNickname = 0; wxString wxSProperty; wxString wxSPropertyVCARD4; wxString wxSPropertySeg1; @@ -107,7 +99,6 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ bool XVCard4Value = FALSE; bool VCard3Value = FALSE; - bool SeekItemData = FALSE; wxString strVer; @@ -855,40 +846,7 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ } - int FNCount = 0; - int NameCount = 0; - int NicknameCount = 0; - int ADRCount = 0; - int EmailCount = 0; - int IMPPCount = 0; - int TelCount = 0; - int LangCount = 0; - int TZCount = 0; - int GeoCount = 0; - int URLCount = 0; - int RelatedCount = 0; - int TitleCount = 0; - int RoleCount = 0; - int OrgCount = 0; - int NoteCount = 0; - int CategoryCount = 0; - int PhotoCount = 0; - int LogoCount = 0; - int SoundCount = 0; - int CalAdrCount = 0; - int CalReqAdrCount = 0; - int FreeBusyCount = 0; - int KeyCount = 0; - int VendorCount = 0; - int XTokenCount = 0; - int ItemSeek = 1; - int MaxItemNumber = 0; - int ItemOrdered = 0; - int ItemUnordered = 0; - int ItemNumber = 0; size_t ItemStringSeekLen = 0; - int ItemSeekSub = 0; - int ItemSeekSecSub = 0; std::map NumberedName; std::map NumberedData; @@ -929,7 +887,6 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ XVCard4Value = FALSE; VCard3Value = FALSE; - SeekItemData = FALSE; std::map ItemMapIndex;