- //wxString vcardfilenamewxs;\r
- wxString vCardFilename;\r
- wxString vCardFilenameFull;\r
- wxString vCardDataString;\r
- //wxStringTokenizer vcardfileline;\r
- wxString lwxs;\r
- wxString setname, setvalue;\r
- //vCardNames = new std::map<wxString, wxString, std::greater<wxString>>;\r
- std::multimap<wxString, ContactData, std::greater<wxString>> vCardNamesAsc;\r
- std::multimap<wxString, ContactData, std::less<wxString>> vCardNamesDsc;\r
- int ContactIndex = 0;\r
+ //wxString vcardfilenamewxs;\r
+ wxString vCardFilename;\r
+ wxString vCardFilenameFull;\r
+ wxString vCardDataString;\r
+ //wxStringTokenizer vcardfileline;\r
+ wxString lwxs;\r
+ wxString setname, setvalue;\r
+ //vCardNames = new std::map<wxString, wxString, std::greater<wxString>>;\r
+ std::multimap<wxString, ContactData, std::greater<wxString>> vCardNamesAsc;\r
+ std::multimap<wxString, ContactData, std::less<wxString>> vCardNamesDsc;\r
+ int ContactIndex = 0;\r
- if (vCardFilename.Right(4) == wxT(".vcf") || \r
- vCardFilename.Right(4) == wxT(".VCF") || \r
- vCardFilename.Right(5) == wxT(".vcard") || \r
- vCardFilename.Right(5) == wxT(".VCARD")){\r
+ if (vCardFilename.Right(4) == wxT(".vcf") || \r
+ vCardFilename.Right(4) == wxT(".VCF") || \r
+ vCardFilename.Right(5) == wxT(".vcard") || \r
+ vCardFilename.Right(5) == wxT(".VCARD")){\r
- vCardFilenameFull.Append(AccountDirFinal);\r
- vCardFilenameFull.Append(wxT("/"));\r
- vCardFilenameFull.Append(vCardFilename);\r
+ vCardFilenameFull.Append(AccountDirFinal);\r
+ vCardFilenameFull.Append(wxT("/"));\r
+ vCardFilenameFull.Append(vCardFilename);\r
- vCardFilename.Clear();\r
- vCardFilenameFull.Clear();\r
- vCardDataString.Clear();\r
- ProcFiles = vcardaccdir.GetNext(&vCardFilename);\r
- continue;\r
+ vCardFilename.Clear();\r
+ vCardFilenameFull.Clear();\r
+ vCardDataString.Clear();\r
+ ProcFiles = vcardaccdir.GetNext(&vCardFilename);\r
+ continue;\r
- wxString PersonName = Person.Get(wxT("N"));\r
- wxString PersonUID = Person.Get(wxT("UID"));\r
- wxString PersonFilename = vCardFilenameFull;\r
+ wxString PersonName = Person.Get(wxT("N"));\r
+ wxString PersonUID = Person.Get(wxT("UID"));\r
+ wxString PersonFilename = vCardFilenameFull;\r
- PersonData.ContactName = PersonName;\r
- PersonData.ContactUID = PersonUID;\r
- PersonData.ContactFilename = PersonFilename;\r
+ PersonData.ContactName = PersonName;\r
+ PersonData.ContactUID = PersonUID;\r
+ PersonData.ContactFilename = PersonFilename;\r
- //ContactsNames.insert(std::make_pair(PersonName, ContactIndex));\r
- //ContactsUIDs.insert(std::make_pair(ContactIndex, PersonUID));\r
+ //ContactsNames.insert(std::make_pair(PersonName, ContactIndex));\r
+ //ContactsUIDs.insert(std::make_pair(ContactIndex, PersonUID));\r
- if (XVMData.AscendingMode == TRUE){\r
- vCardNamesAsc.insert(std::make_pair(vCardDataString, PersonData));\r
- } else {\r
- vCardNamesDsc.insert(std::make_pair(vCardDataString, PersonData));\r
- }\r
+ if (XVMData.AscendingMode == TRUE){\r
+ \r
+ vCardNamesAsc.insert(std::make_pair(vCardDataString, PersonData));\r
+ \r
+ } else {\r
+ \r
+ vCardNamesDsc.insert(std::make_pair(vCardDataString, PersonData));\r
+ \r
+ }\r
- }\r
- \r
- vCardFilename.Clear();\r
- vCardFilenameFull.Clear();\r
- vCardDataString.Clear();\r
- ProcFiles = vcardaccdir.GetNext(&vCardFilename);\r
+ vCardFilename.Clear();\r
+ vCardFilenameFull.Clear();\r
+ vCardDataString.Clear();\r
+ ProcFiles = vcardaccdir.GetNext(&vCardFilename);\r
- for (std::map<wxString,ContactData>::iterator iter = vCardNamesAsc.begin(); \r
- iter != vCardNamesAsc.end(); ++iter){\r
+ for (std::map<wxString,ContactData>::iterator iter = vCardNamesAsc.begin(); \r
+ iter != vCardNamesAsc.end(); ++iter){\r
- for (std::map<wxString,ContactData>::iterator iter = vCardNamesDsc.begin();\r
- iter != vCardNamesDsc.end(); ++iter){\r
+ for (std::map<wxString,ContactData>::iterator iter = vCardNamesDsc.begin();\r
+ iter != vCardNamesDsc.end(); ++iter){\r