From: Steve Brokenshire Date: Sun, 2 Aug 2015 13:13:06 +0000 (+0100) Subject: Removed most unused variables and used correct variable types. X-Git-Tag: release-0.05~103 X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=237a08f1e191a1b72fe7acbcb5c73d153e91657b;p=xestiaab%2F.git Removed most unused variables and used correct variable types. --- diff --git a/source/vcard/vcard34conv.cpp b/source/vcard/vcard34conv.cpp index 62efc90..0c3c545 100644 --- a/source/vcard/vcard34conv.cpp +++ b/source/vcard/vcard34conv.cpp @@ -97,7 +97,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString wxSPropertySeg1; wxString wxSPropertySeg2; wxString wxSPropertyNextLine; - int ContactLineLen = 0; + size_t ContactLineLen = 0; int QuoteBreakPoint = 0; int FNCount = 0; int NameCount = 0; @@ -231,7 +231,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ if (wxSProperty == wxT("FN")){ - int intPropertyLen = wxSPropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -239,16 +238,8 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 4; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - //SplitValues(&wxSPropertySeg1, &SplitPoints, &SplitLength, intPrevValue); intPrevValue = 3; @@ -283,7 +274,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ } else if (wxSProperty == wxT("N") && NameProcessed == FALSE){ - int intPropertyLen = wxSPropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -291,15 +281,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 3; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - intPrevValue = 2; @@ -321,7 +303,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ // Process Data. - int intPropertyLen = wxSPropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -329,15 +310,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 5; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - intPrevValue = 4; @@ -349,7 +322,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ // Process Data. - int intPropertyLen = wxSPropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -357,15 +329,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 7; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - intPrevValue = 6; @@ -373,7 +337,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ } else if (wxSProperty == wxT("NICKNAME")){ - int intPropertyLen = wxSPropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -381,15 +344,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 10; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - intPrevValue = 9; @@ -428,7 +383,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ // Do PID/ALTID/LANG things. - int intPropertyLen = wxSPropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -436,14 +390,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE;; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 8; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; intPrevValue = 7; @@ -482,7 +429,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ // Process date. Preserve the remainder in the string. - int intPropertyLen = wxSPropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -490,16 +436,8 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool BirthdayText = FALSE; - bool FirstToken = TRUE; - bool NoYear = FALSE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool NoYear = FALSE; int intPrevValue = 6; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; wxString strResults; @@ -561,7 +499,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ // Process date. Preserve the remainder in the string. - int intPropertyLen = wxSPropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -569,15 +506,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool AnniversaryText = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 13; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; wxString strResults; bool NoYear = FALSE; @@ -602,8 +531,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ } - - if (NoYear == TRUE){ ContactDatav3.AddRaw(wxT("ANNIVERSARY;X-APPLE-OMIT-YEAR=1604"), strResults); @@ -638,7 +565,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ } else if (wxSProperty == wxT("TZ")){ - int intPropertyLen = wxSPropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -646,15 +572,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 4; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - intPrevValue = 3; @@ -672,7 +590,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ } else if (wxSProperty == wxT("ADR")){ - int intPropertyLen = wxSPropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -697,15 +614,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString AddressRegion; wxString AddressPostalCode; wxString AddressCountry; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 5; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - intPrevValue = 4; @@ -731,8 +640,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ // TODO: Continue from here! See ADR for good example (Replace initer with intPrevValue). // Remove inserted comma for Extra Tokens in frmContactEditor.cpp - - int intPropertyLen = wxSPropertySeg1.Len(); + std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -758,16 +666,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString AddressRegion; wxString AddressPostalCode; wxString AddressCountry; - bool AfterFirstProperty = FALSE; - bool FirstToken = TRUE; - int intSplitSeek = 0; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 7; - int intPref = 0; - int intType = 0; - int intSplitPoint = 0; - intPrevValue = 6; @@ -790,8 +689,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ ItemSeek++; } else if (wxSProperty == wxT("IMPP")){ - - int intPropertyLen = wxSPropertySeg1.Len(); + std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -802,16 +700,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyTokens; wxString IMPPType; wxString IMPPAddress; - bool AfterFirstProperty = FALSE; - bool FirstToken = TRUE; - int intSplitSeek = 0; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 6; - int intPref = 0; - int intType = 0; - int intSplitPoint = 0; - SplitValues(&wxSPropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -833,13 +722,12 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ } - ItemSeek++; + ItemSeek++; } else if (wxSProperty == wxT("TEL")){ // Check TEL and make sure it is functioning properly. - int intPropertyLen = wxSPropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map TypeSplitPoints; @@ -858,18 +746,12 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString TelTypeDetail; wxString TelTypeOut; wxString FinalFriendlyString; - bool AfterFirstProperty = FALSE; - bool FirstToken = TRUE; - bool SkipFirst = TRUE; - int intSplitSeek = 0; int intSplitsFound = 0; int intSplitSize = 0; int intPrevValue = 5; - int intPref = 0; int intType = 0; int intSplitPoint = 0; - intPrevValue = 4; SplitValues(&wxSPropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -896,7 +778,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ // Strip out the quotes if they are there. - int intPropertyValueLen = PropertyValue.Len(); + size_t intPropertyValueLen = PropertyValue.Len(); if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){ @@ -1078,8 +960,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ ItemSeek++; } else if (wxSProperty == wxT("LANG")){ - - int intPropertyLen = wxSPropertySeg1.Len(); + std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -1087,31 +968,22 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 6; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - intPrevValue = 5; - if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){ + if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){ - ContactDatav3.AddRaw(wxT("X-VCARD4-LANG"), wxSPropertySeg2); + ContactDatav3.AddRaw(wxT("X-VCARD4-LANG"), wxSPropertySeg2); - } else { + } else { - ContactDatav3.AddRaw(wxT("X-VCARD4-LANG;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2); + ContactDatav3.AddRaw(wxT("X-VCARD4-LANG;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2); - } + } } else if (wxSProperty == wxT("GEO")){ - int intPropertyLen = wxSPropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -1120,16 +992,8 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyValue; wxString PropertyTokens; wxString GeoType; - wxString GeoData; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + wxString GeoData; int intPrevValue = 5; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - intPrevValue = 4; @@ -1163,7 +1027,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ } else if (wxSProperty == wxT("RELATED")){ - int intPropertyLen = wxSPropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -1173,16 +1036,9 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyTokens; wxString RelatedType; wxString RelatedTypeOriginal; - wxString RelatedName; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + wxString RelatedName; + bool FirstToken = TRUE; int intPrevValue = 9; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - intPrevValue = 8; @@ -1318,8 +1174,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ ItemSeek++; } else if (wxSProperty == wxT("URL")){ - - int intPropertyLen = wxSPropertySeg1.Len(); + std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -1327,15 +1182,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 5; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - intPrevValue = 4; @@ -1358,8 +1205,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ ItemSeek++; } else if (wxSProperty == wxT("TITLE")) { - - int intPropertyLen = wxSPropertySeg1.Len(); + std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -1367,15 +1213,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 7; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - intPrevValue = 6; @@ -1413,7 +1251,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ } else if (wxSProperty == wxT("ROLE")) { - int intPropertyLen = wxSPropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -1421,15 +1258,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 6; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - intPrevValue = 5; @@ -1444,8 +1273,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ } } else if (wxSProperty == wxT("ORG")) { - - int intPropertyLen = wxSPropertySeg1.Len(); + std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -1453,15 +1281,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 5; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - intPrevValue = 4; @@ -1497,7 +1317,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ } else if (wxSProperty == wxT("NOTE")) { - int intPropertyLen = wxSPropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -1505,15 +1324,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 6; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - intPrevValue = 5; @@ -1549,7 +1360,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ } else if (wxSProperty == wxT("CATEGORIES")) { - int intPropertyLen = wxSPropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -1558,15 +1368,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyValue; wxString PropertyTokens; wxString PropertyType; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 12; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - intPrevValue = 11; @@ -1582,7 +1384,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ } else if (wxSProperty == wxT("PHOTO")) { - int intPropertyLen = wxSPropertySeg1.Len(); + size_t intPropertyLen = wxSPropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -1590,14 +1392,9 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool FirstToken = TRUE; int intSplitsFound = 0; int intSplitSize = 0; int intPrevValue = 7; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - intPropertyLen = wxSPropertySeg2.Len(); SplitPoints.clear(); @@ -1639,7 +1436,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString wxSPhotoData; std::string base64enc; - if (intSplitsFound = 0){ + if (intSplitsFound == 0){ } else { @@ -1728,7 +1525,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ } else if (wxSProperty == wxT("LOGO")) { - int intPropertyLen = wxSPropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -1736,14 +1532,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 6; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - intPrevValue = 5; @@ -1759,7 +1548,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ } else if (wxSProperty == wxT("SOUND")) { - int intPropertyLen = wxSPropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -1767,14 +1555,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 7; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - intPrevValue = 6; @@ -1790,7 +1571,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ } else if (wxSProperty == wxT("CALURI")){ - int intPropertyLen = wxSPropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -1798,31 +1578,22 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 8; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - - + intPrevValue = 7; - if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){ + if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){ - ContactDatav3.AddRaw(wxT("X-VCARD4-CALURI"), wxSPropertySeg2); + ContactDatav3.AddRaw(wxT("X-VCARD4-CALURI"), wxSPropertySeg2); - } else { + } else { - ContactDatav3.AddRaw(wxT("X-VCARD4-CALURI;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2); + ContactDatav3.AddRaw(wxT("X-VCARD4-CALURI;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2); - } + } } else if (wxSProperty == wxT("CALADRURI")){ - - int intPropertyLen = wxSPropertySeg1.Len(); + std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -1830,15 +1601,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 11; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - intPrevValue = 10; @@ -1854,7 +1617,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ } else if (wxSProperty == wxT("FBURL")){ - int intPropertyLen = wxSPropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -1862,16 +1624,8 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 7; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - - + intPrevValue = 6; if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){ @@ -1886,7 +1640,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ } else if (wxSProperty == wxT("KEY")){ - int intPropertyLen = wxSPropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -1894,27 +1647,19 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 5; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - intPrevValue = 4; - if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){ + if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){ - ContactDatav3.AddRaw(wxT("X-VCARD4-KEY"), wxSPropertySeg2); + ContactDatav3.AddRaw(wxT("X-VCARD4-KEY"), wxSPropertySeg2); - } else { + } else { - ContactDatav3.AddRaw(wxT("X-VCARD4-KEY;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2); + ContactDatav3.AddRaw(wxT("X-VCARD4-KEY;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2); - } + } } else if (wxSProperty == wxT("UID")){ @@ -1928,9 +1673,8 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ wxString wxSVNDID; wxString wxSVNDPropName; - - int intPrevValue = (wxSProperty.Len() + 1); + size_t intPrevValue = (wxSProperty.Len() + 1); while (wSTVendorDetails.HasMoreTokens() == TRUE){ @@ -1952,20 +1696,18 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){ } } else if (wxSProperty.Mid(0, 2) == wxT("X-")){ - - - int intPrevValue = (wxSProperty.Len() + 1); + size_t intPrevValue = (wxSProperty.Len() + 1); - if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){ + if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){ - ContactDatav3.AddRaw(wxSProperty, wxSPropertySeg2); + ContactDatav3.AddRaw(wxSProperty, wxSPropertySeg2); - } else { + } else { - ContactDatav3.AddRaw(wxSProperty + wxT(";") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2); + ContactDatav3.AddRaw(wxSProperty + wxT(";") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2); - } + } } @@ -2015,8 +1757,6 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ bool QuoteMode = FALSE; bool PropertyFind = TRUE; - bool HasExtraNicknames = FALSE; - bool IgnoreGender = FALSE; bool ExtraLineSeek = TRUE; bool ExtraLineSeekSub = TRUE; bool BirthdayProcessed = FALSE; @@ -2044,10 +1784,10 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ wxString PropertyName; wxString PropertyValue; wxString PropertyDataStr; - int ContactLineLen = 0; - int ContactLineSubLen = 0; + size_t ContactLineLen = 0; + size_t ContactLineSubLen = 0; int QuoteBreakPoint = 0; - int intPrevValueSub = 0; + size_t intPrevValueSub = 0; std::map PropertyData; std::map PropertyLock; @@ -2270,7 +2010,7 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ ExtraLineSeekSub = TRUE; iterboolsub = ContactFileProcessed.find(itersub->first); - std::map::iterator iterorig = ContactFileProcessed.find(itersub->first); + //std::map::iterator iterorig = ContactFileProcessed.find(itersub->first); //std::map::iterator itersuborig; // Ignore certain variables as they are not needed. @@ -2323,7 +2063,7 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ while (ExtraLineSeekSub == TRUE){ if (itersub == ContactFileLines.end()){ - ExtraLineSeekSub; + ExtraLineSeekSub = FALSE; continue; } else { itersub++; @@ -2461,12 +2201,10 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ intPrevValueSub = (wxSProperty.Len() + 2); - SplitValuesData(&wxSPropertyChopped, &TempSplitPoints, &TempSplitLength, intPrevValueSub, &TempPropertyData); + SplitValuesData(&wxSPropertyChopped, &TempSplitPoints, &TempSplitLength, (int)intPrevValueSub, &TempPropertyData); // Process the splitted data into temporary property data. - - bool FirstToken = TRUE; - + // Look for certain property names and the X-FIRST // property name. @@ -2739,7 +2477,7 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ // (indicated by space or tab at the start) and add data. if (itersub == ContactFileLines.end()){ - ExtraLineSeekSub; + ExtraLineSeekSub = FALSE; continue; } else { @@ -2830,7 +2568,6 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ std::map DataLineProcess; std::map::iterator DLSLiter; - int DataLineSeek = 0; // Look for the X-VCARD4-(variablename) equivilant. @@ -2923,7 +2660,7 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ int ItemOrdered = 0; int ItemUnordered = 0; int ItemNumber = 0; - int ItemStringSeekLen = 0; + size_t ItemStringSeekLen = 0; int ItemSeekSub = 0; int ItemSeekSecSub = 0; //int intValueSeek = 1; @@ -2954,7 +2691,6 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){ ExtraLineSeekSub = 0; wxString wxSPropertyNextLineSub; ContactLineSubLen = 0; - int ContactLineSeekSub = 0; int ItemIndex = 0; PropertFindSub.clear(); wxSPropertySub.clear(); @@ -3351,7 +3087,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString wxSProperty; wxString wxSPropertySeg1Chopped; - + size_t intPropertyLen; + if (ProcessItemData == TRUE){ wxStringTokenizer wxSPropertySplit(*wxSPropertyName, wxT(".")); @@ -3378,9 +3115,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // EMAIL if (wxSProperty == wxT("EMAIL")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -3398,15 +3133,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 7; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - wxSPropertyDataOut->Append(*wxSPropertySeg2Ptr); *wxSPropertyDataNameOut = wxT("EMAIL"); @@ -3520,9 +3248,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // ADR if (wxSProperty == wxT("ADR")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -3540,15 +3266,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 5; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - wxSPropertyDataOut->Append(*wxSPropertySeg2Ptr); *wxSPropertyDataNameOut = wxT("ADR"); @@ -3658,9 +3377,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // LABEL if (wxSProperty == wxT("LABEL")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -3678,15 +3395,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; - int intPrevValue = 7; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - + bool FirstToken = TRUE; + int intPrevValue = 7; wxSPropertyDataOut->Append(*wxSPropertySeg2Ptr); *wxSPropertyDataNameOut = wxT("ADR"); @@ -3791,9 +3501,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // IMPP if (wxSProperty == wxT("IMPP")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -3811,15 +3519,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 6; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - wxStringTokenizer IMPPSplit(*wxSPropertySeg2Ptr, wxT(":")); wxString IMPPType; @@ -3946,9 +3647,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // TEL if (wxSProperty == wxT("TEL")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -3967,15 +3666,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 5; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - wxSPropertyDataOut->Append(wxT("tel:")); wxSPropertyDataOut->Append(*wxSPropertySeg2Ptr); @@ -4192,9 +3884,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // RELATED if (wxSProperty == wxT("X-ABRELATEDNAMES")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -4212,15 +3902,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 18; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - wxSPropertyDataOut->Append(*wxSPropertySeg2Ptr); *wxSPropertyDataNameOut = wxT("RELATED"); @@ -4310,9 +3993,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // URL if (wxSProperty == wxT("URL")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -4330,15 +4011,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 5; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - wxSPropertyDataOut->Append(*wxSPropertySeg2Ptr); *wxSPropertyDataNameOut = wxT("URL"); @@ -4442,8 +4116,6 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, if (wxSProperty == wxT("TITLE")){ - int intPropertyLen; - if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -4461,15 +4133,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 7; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - wxSPropertyDataOut->Append(*wxSPropertySeg2Ptr); *wxSPropertyDataNameOut = wxT("TITLE"); @@ -4555,9 +4220,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // FN if (wxSProperty == wxT("FN")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -4575,15 +4238,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 4; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - wxSPropertyDataOut->Append(*wxSPropertySeg2Ptr); *wxSPropertyDataNameOut = wxT("FN"); @@ -4669,9 +4325,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // N if (wxSProperty == wxT("N")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -4689,16 +4343,9 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; - int intPrevValue = 3; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - - + bool FirstToken = TRUE; + int intPrevValue = 3; + wxSPropertyDataOut->Append(*wxSPropertySeg2Ptr); *wxSPropertyDataNameOut = wxT("N"); *VCardV3Value = TRUE; @@ -4783,9 +4430,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // UID if (wxSProperty == wxT("UID")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -4803,15 +4448,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 5; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - wxSPropertyDataOut->Append(*wxSPropertySeg2Ptr); *wxSPropertyDataNameOut = wxT("UID"); @@ -4897,9 +4535,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // NICKNAME if (wxSProperty == wxT("NICKNAME")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -4917,15 +4553,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 10; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - wxSPropertyDataOut->Append(*wxSPropertySeg2Ptr); *wxSPropertyDataNameOut = wxT("NICKNAME"); @@ -5011,9 +4640,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // GENDER if (wxSProperty == wxT("GENDER")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -5031,15 +4658,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 8; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - wxSPropertyDataOut->Append(*wxSPropertySeg2Ptr); *wxSPropertyDataNameOut = wxT("GENDER"); @@ -5125,9 +4745,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // BDAY if (wxSProperty == wxT("BDAY")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -5146,15 +4764,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyValue; wxString PropertyTokens; wxString PropertyXOmitYear; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 6; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - *wxSPropertyDataNameOut = wxT("BDAY"); *VCardV3Value = TRUE; @@ -5275,9 +4886,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // ANNIVERSARY if (wxSProperty == wxT("ANNIVERSARY")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -5296,15 +4905,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyValue; wxString PropertyTokens; wxString PropertyXOmitYear; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 13; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - *wxSPropertyDataNameOut = wxT("ANNIVERSARY"); *VCardV3Value = TRUE; @@ -5426,9 +5028,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // is kept as X-VCARD3-TZ for the time being. if (wxSProperty == wxT("TZ")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -5447,15 +5047,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyValue; wxString PropertyTokens; wxString PropertyXOmitYear; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 4; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - wxSPropertyDataOut->Append(*wxSPropertySeg2Ptr); *wxSPropertyDataNameOut = wxT("X-VCARD3-TZ"); @@ -5541,9 +5134,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // ROLE if (wxSProperty == wxT("ROLE")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -5562,15 +5153,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyValue; wxString PropertyTokens; wxString PropertyXOmitYear; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 6; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - wxSPropertyDataOut->Append(*wxSPropertySeg2Ptr); *wxSPropertyDataNameOut = wxT("ROLE"); @@ -5656,9 +5240,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // ORG if (wxSProperty == wxT("ORG")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -5677,15 +5259,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyValue; wxString PropertyTokens; wxString PropertyXOmitYear; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 5; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - wxSPropertyDataOut->Append(*wxSPropertySeg2Ptr); *wxSPropertyDataNameOut = wxT("ORG"); @@ -5771,9 +5346,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // NOTE if (wxSProperty == wxT("NOTE")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -5792,15 +5365,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyValue; wxString PropertyTokens; wxString PropertyXOmitYear; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 6; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - wxSPropertyDataOut->Append(*wxSPropertySeg2Ptr); *wxSPropertyDataNameOut = wxT("NOTE"); @@ -5887,8 +5453,6 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, if (wxSProperty == wxT("PHOTO")){ - int intPropertyLen; - if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -5908,15 +5472,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyValue; wxString PropertyTokens; wxString PropertyXOmitYear; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 7; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - *wxSPropertyDataNameOut = wxT("PHOTO"); *VCardV3Value = TRUE; @@ -6000,9 +5556,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // SOUND if (wxSProperty == wxT("SOUND")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -6021,15 +5575,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyValue; wxString PropertyTokens; wxString PropertyXOmitYear; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 7; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - *wxSPropertyDataNameOut = wxT("SOUND"); *VCardV3Value = TRUE; @@ -6137,8 +5684,6 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, if (wxSProperty == wxT("X-VCARD4-FN")){ - int intPropertyLen; - if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -6158,15 +5703,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 13; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -6258,9 +5796,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-N if (wxSProperty == wxT("X-VCARD4-N")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -6279,15 +5815,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 12; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -6380,9 +5909,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-NICKNAME if (wxSProperty == wxT("X-VCARD4-NICKNAME")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -6401,15 +5928,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 19; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -6502,9 +6022,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-GENDER if (wxSProperty == wxT("X-VCARD4-GENDER")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -6523,15 +6041,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 17; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -6624,9 +6135,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-BDAY if (wxSProperty == wxT("X-VCARD4-BDAY")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -6645,15 +6154,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 15; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -6746,9 +6248,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-ANNIVERSARY if (wxSProperty == wxT("X-VCARD4-ANNIVERSARY")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -6767,15 +6267,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 22; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -6868,9 +6361,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-TZ if (wxSProperty == wxT("X-VCARD4-TZ")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -6889,15 +6380,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 13; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -6990,9 +6474,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-ADR if (wxSProperty == wxT("X-VCARD4-ADR")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -7011,15 +6493,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 14; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -7112,9 +6587,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-EMAIL if (wxSProperty == wxT("X-VCARD4-EMAIL")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -7133,15 +6606,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 16; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -7234,9 +6700,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-IMPP if (wxSProperty == wxT("X-VCARD4-IMPP")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -7255,15 +6719,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 15; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -7356,9 +6813,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-TEL if (wxSProperty == wxT("X-VCARD4-TEL")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -7377,15 +6832,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 14; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -7478,9 +6926,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-LANG if (wxSProperty == wxT("X-VCARD4-LANG")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -7499,15 +6945,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 15; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -7600,9 +7039,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-GEO if (wxSProperty == wxT("X-VCARD4-GEO")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -7621,15 +7058,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 14; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -7722,9 +7152,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-RELATED if (wxSProperty == wxT("X-VCARD4-RELATED")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -7743,15 +7171,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 18; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -7844,9 +7265,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-URL if (wxSProperty == wxT("X-VCARD4-URL")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -7865,15 +7284,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 14; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -7966,9 +7378,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-TITLE if (wxSProperty == wxT("X-VCARD4-TITLE")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -7987,15 +7397,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 16; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -8088,9 +7491,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-ROLE if (wxSProperty == wxT("X-VCARD4-ROLE")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -8109,15 +7510,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 15; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -8210,9 +7604,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-ORG if (wxSProperty == wxT("X-VCARD4-ORG")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -8231,15 +7623,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 14; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -8332,9 +7717,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-NOTE if (wxSProperty == wxT("X-VCARD4-NOTE")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -8353,15 +7736,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 15; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -8454,9 +7830,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-CATEGORIES if (wxSProperty == wxT("X-VCARD4-CATEGORIES")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -8475,15 +7849,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 21; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -8576,9 +7943,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-PHOTO if (wxSProperty == wxT("X-VCARD4-PHOTO")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -8597,15 +7962,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 16; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -8698,9 +8056,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-LOGO if (wxSProperty == wxT("X-VCARD4-LOGO")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -8719,15 +8075,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 15; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -8820,9 +8169,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-SOUND if (wxSProperty == wxT("X-VCARD4-SOUND")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -8841,15 +8188,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 16; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -8942,9 +8282,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-CALURI if (wxSProperty == wxT("X-VCARD4-CALURI")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -8963,15 +8301,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 17; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -9064,9 +8395,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-CALADRURI if (wxSProperty == wxT("X-VCARD4-CALADRURI")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -9085,15 +8414,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 20; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -9186,9 +8508,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-FBURL if (wxSProperty == wxT("X-VCARD4-FBURL")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -9207,15 +8527,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 16; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -9308,9 +8621,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-KEY if (wxSProperty == wxT("X-VCARD4-KEY")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -9329,15 +8640,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 14; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -9430,9 +8734,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, // X-VCARD4-VND-* if (wxSProperty.Mid(0, 12) == wxT("X-VCARD4-VND")){ - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -9451,15 +8753,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 14; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -9554,9 +8849,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, if (wxSProperty == wxT("X-ADDRESSBOOKSERVER-KIND")){ // Process Data. - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -9575,15 +8868,8 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 26; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -9679,9 +8965,7 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, if (wxSProperty == wxT("X-ADDRESSBOOKSERVER-MEMBER")){ // Process Data. - - int intPropertyLen; - + if (ProcessItemData == TRUE){ intPropertyLen = wxSPropertySeg1Chopped.Len(); @@ -9695,20 +8979,13 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; - std::map::iterator BIter;; + std::map::iterator BIter;; wxString PropertyData; wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; + bool FirstToken = TRUE; int intPrevValue = 28; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - if (ProcessItemData == TRUE){ @@ -9804,23 +9081,16 @@ void vCard34Conv::ConvertV4PropertyProc(wxString *wxSPropertyName, if (wxSProperty == wxT("X-ABLabel") && ProcessItemData == TRUE){ - int intPropertyLen = wxSPropertySeg1Ptr->Len(); - std::map SplitPoints; + //int intPropertyLen = wxSPropertySeg1Ptr->Len(); + intPropertyLen = wxSPropertySeg1Ptr->Len(); + std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; wxString PropertyData; wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - bool AfterFirstToken = FALSE; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; int intPrevValue = 11; - int intPref = 0; - int intType = 0; - int intSplitSeek = 0; - SplitValues(wxSPropertySeg1Ptr, &SplitPoints, &SplitLength, intPrevValue); @@ -9842,7 +9112,7 @@ void vCard34Conv::SplitValues(wxString *PropertyLine, std::map *SplitLength, int intSize){ - int intPropertyLen = PropertyLine->Len(); + size_t intPropertyLen = PropertyLine->Len(); int intSplitsFound = 0; int intSplitSize = 0; int intSplitSeek = 0; @@ -9898,7 +9168,7 @@ void vCard34Conv::SplitValuesData(wxString *PropertyLine, wxStringTokenizer PropertyElement; wxString PropertyName; wxString PropertyValue; - int intPropertyLen = PropertyLine->Len(); + size_t intPropertyLen = PropertyLine->Len(); int intSplitsFound = 0; int intSplitSize = 0; int intSplitSeek = (intSize - 1);