From ba5efde9da9861c2880b92c1e3ffed5571800f29 Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Tue, 15 Mar 2016 21:28:19 +0000 Subject: [PATCH] Removed commented out code from vcard/vcard34conv-v4conv.cpp --- source/vcard/vcard34conv-v4conv.cpp | 100 +++------------------------- 1 file changed, 8 insertions(+), 92 deletions(-) diff --git a/source/vcard/vcard34conv-v4conv.cpp b/source/vcard/vcard34conv-v4conv.cpp index 2813d8b..3e0ff06 100644 --- a/source/vcard/vcard34conv-v4conv.cpp +++ b/source/vcard/vcard34conv-v4conv.cpp @@ -121,12 +121,12 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ vCardOut->AddRaw(wxT("VERSION"), wxT("4.0")); vCardOut->AddRaw(wxT("PRODID"), strVer); - // FN - // NICKNAME - // TITLE - // ORG - // NOTE - // PHOTO + // FN + // NICKNAME + // TITLE + // ORG + // NOTE + // PHOTO // Process the properties which have X-FIRST. @@ -225,13 +225,10 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ if (wxSPropertyNextLine.Mid(0, 1) == wxT(" ") || wxSPropertyNextLine.Mid(0, 1) == wxT("\t")){ wxSPropertyNextLine.Remove(0, 1); - //wxSPropertyNextLine.Trim(FALSE); - //ContactLine.Trim(); ContactLine.Append(wxSPropertyNextLine); DataLineProcessOriginal.insert(std::make_pair(DataLineSeekOrig, iterboolsub->first)); DataLineSeekOrig++; - //iterboolsub->second = TRUE; - + } else { ExtraLineSeek = FALSE; @@ -300,16 +297,11 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ for (std::map::iterator itersub = ContactFileLines.begin(); itersub != ContactFileLines.end(); ++itersub){ - //DataLineProcess = DataLineProcessOriginal; - //DataLineSeek = DataLineSeekOrig; - ContactLineSub = itersub->second; ExtraLineSeekSub = TRUE; iterboolsub = ContactFileProcessed.find(itersub->first); - //std::map::iterator iterorig = ContactFileProcessed.find(itersub->first); - //std::map::iterator itersuborig; // Ignore certain variables as they are not needed. @@ -350,14 +342,10 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ continue; } - - //std::map::iterator itersub = iter; DataLineProcess.insert(std::make_pair(DataLineSeek, itersub->first)); DataLineSeek++; - - while (ExtraLineSeekSub == TRUE){ if (itersub == ContactFileLines.end()){ @@ -375,10 +363,7 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ if (wxSPropertyNextLine.Mid(0, 1) == wxT(" ") || wxSPropertyNextLine.Mid(0, 1) == wxT("\t")){ wxSPropertyNextLine.Remove(0, 1); - //wxSPropertyNextLine.Trim(FALSE); - //ContactLine.Trim(); ContactLineSub.Append(wxSPropertyNextLine); - //iterboolsub->second = TRUE; DataLineProcess.insert(std::make_pair(DataLineSeek, itersub->first)); DataLineSeek++; @@ -390,55 +375,6 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ } } - - /*while (ExtraLineSeekSub == TRUE && iterboolsub != ContactFileProcessedWorking.end()){ - - // Check if there is extra data on the next line - // (indicated by space or tab at the start) and add data. - - itersub++; - - iterboolsub = ContactFileProcessedWorking.find(itersub->first); - - if (iterboolsub->second == TRUE){ - - continue; - - } - - if (itersub == ContactFileLines.end()){ - - break; - - } - - wxSPropertyNextLine = itersub->second; - - if (wxSPropertyNextLine.Mid(0, 1) == wxT(" ") || wxSPropertyNextLine.Mid(0, 1) == wxT("\t")){ - - wxSPropertyNextLine.Remove(0, 1); - //wxSPropertyNextLine.Trim(FALSE); - //ContactLine.Trim(); - ContactLineSub.Append(wxSPropertyNextLine); - //iterboolsub->second = TRUE; - DataLineProcess.insert(std::make_pair(DataLineSeek, itersub->first)); - DataLineSeek++; - - } else { - - itersub--; - ExtraLineSeekSub = FALSE; - - } - - if (iterboolsub == ContactFileProcessedWorking.end()){ - - break; - ExtraLineSeekSub = FALSE; - - } - - }*/ ContactLineSubLen = ContactLineSub.Len(); PropertyFind = TRUE; @@ -539,8 +475,6 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ TempPropertyData.clear(); } else { - - wxT("PHOTODANCEMATCH!"); for (std::map::iterator xfiter = TempPropertyData.begin(); xfiter != TempPropertyData.end(); ++xfiter){ @@ -700,8 +634,6 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ wxSPropertyData.Clear(); wxSPropertyXVCard4Value.Clear(); wxSPropertyNameConv.Clear(); - //FinalPropertyData.clear(); - //FinalPropValue.clear(); PropertyData.clear(); PropertyLock.clear(); ContactLine.clear(); @@ -808,8 +740,6 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ if (wxSPropertyNextLine.Mid(0, 1) == wxT(" ") || wxSPropertyNextLine.Mid(0, 1) == wxT("\t")){ wxSPropertyNextLine.Remove(0, 1); - //wxSPropertyNextLine.Trim(FALSE); - //ContactLine.Trim(); ContactLine.Append(wxSPropertyNextLine); iterboolsub->second = TRUE; @@ -917,8 +847,6 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ wxSPropertyData.Clear(); wxSPropertyXVCard4Value.Clear(); wxSPropertyNameConv.Clear(); - //FinalPropertyData.clear(); - //FinalPropValue.clear(); PropertyData.clear(); PropertyLock.clear(); ContactLine.clear(); @@ -961,7 +889,6 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ size_t ItemStringSeekLen = 0; int ItemSeekSub = 0; int ItemSeekSecSub = 0; - //int intValueSeek = 1; std::map NumberedName; std::map NumberedData; @@ -1005,7 +932,6 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ SeekItemData = FALSE; std::map ItemMapIndex; - //std::map ItemNameIndex; // Look for item in the initial line, process into a proper line then // look for other lines with the same item association. @@ -1039,7 +965,6 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ // Get Item data. - //ContactLineSeekSub = ContactLineSeek; std::map::iterator itersub = iter; while (ExtraLineSeek == TRUE){ @@ -1073,8 +998,6 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ if (wxSPropertyNextLine.Mid(0, 1) == wxT(" ") || wxSPropertyNextLine.Mid(0, 1) == wxT("\t")){ wxSPropertyNextLine.Remove(0, 1); - //wxSPropertyNextLine.Trim(FALSE); - //ContactLine.Trim(); ContactLine.Append(wxSPropertyNextLine); iterboolsub->second = TRUE; @@ -1175,8 +1098,7 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ iterboolsub->second = TRUE; } - - //ItemNameIndex.insert(std::make_pair(ItemStringSeek, ItemPropName)); + ItemListData->insert(std::make_pair(ItemIndex, ContactLineSub)); ItemMapIndex.insert(std::make_pair(ItemStringSeek, ItemListData)); @@ -1257,8 +1179,6 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ wxSPropertyData.Clear(); wxSPropertyXVCard4Value.Clear(); wxSPropertyNameConv.Clear(); - //FinalPropertyData.clear(); - //FinalPropValue.clear(); PropertyData.clear(); PropertyLock.clear(); ContactLine.clear(); @@ -1284,8 +1204,6 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ wxSPropertyData.Clear(); wxSPropertyXVCard4Value.Clear(); wxSPropertyNameConv.Clear(); - //FinalPropertyData.clear(); - //FinalPropValue.clear(); PropertyData.clear(); PropertyLock.clear(); ContactLine.clear(); @@ -1348,8 +1266,6 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ VCard3Value = FALSE; TempData.clear(); - //PropertyData.clear(); - //PropertyLock.clear(); } -- 2.39.2