From 1719249218515c7703dec75775b0e07112d4c048 Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Mon, 28 Dec 2015 06:14:43 +0000 Subject: [PATCH] Removed intPref and intType from ContactDataObject as they are no longer required. --- source/contacteditor/ContactDataObject.cpp | 61 ---------------------- 1 file changed, 61 deletions(-) diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp index 26dae5b..7a19c0e 100644 --- a/source/contacteditor/ContactDataObject.cpp +++ b/source/contacteditor/ContactDataObject.cpp @@ -473,8 +473,6 @@ void ContactDataObject::ProcessRevision(wxString PropertySeg1, wxString Property int intSplitsFound = 0; int intSplitSize = 0; int intPrevValue = 5; - int intPref = 0; - int intType = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -539,8 +537,6 @@ void ContactDataObject::ProcessSource(wxString PropertySeg1, wxString PropertySe int intSplitsFound = 0; int intSplitSize = 0; int intPrevValue = 8; - int intPref = 0; - int intType = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -638,8 +634,6 @@ void ContactDataObject::ProcessXML(wxString PropertySeg1, wxString PropertySeg2, std::map SplitLength; int intPrevValue = 5; - int intPref = 0; - int intType = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -684,8 +678,6 @@ void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySe std::map SplitLength; int intPrevValue = 8; - int intPref = 0; - int intType = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -742,8 +734,6 @@ void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2, std::map SplitLength; int intPrevValue = 4; - int intPref = 0; - int intType = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -813,8 +803,6 @@ void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){ std::map SplitLength; int intPrevValue = 3; - int intPref = 0; - int intType = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -962,8 +950,6 @@ void ContactDataObject::ProcessClientPIDMap(wxString PropertySeg1, wxString Prop int intSplitsFound = 0; int intSplitSize = 0; int intPrevValue = 14; - int intPref = 0; - int intType = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -1003,7 +989,6 @@ void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString Property std::map SplitLength; int intPrevValue = 10; - int intPref = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -1383,7 +1368,6 @@ void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString Property std::map SplitLength; int intPrevValue = 4; - int intPref = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -1517,9 +1501,6 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS int intSplitsFound = 0; int intSplitSize = 0; int intPrevValue = 5; - int intPref = 0; - int intType = 0; - long ListCtrlIndex; bool PropertyMatched = FALSE; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -1786,7 +1767,6 @@ void ContactDataObject::ProcessEmail(wxString PropertySeg1, wxString PropertySeg std::map SplitLength; int intPrevValue = 7; - int intPref = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -1888,7 +1868,6 @@ void ContactDataObject::ProcessIM(wxString PropertySeg1, wxString PropertySeg2, std::map SplitLength; int intPrevValue = 6; - int intPref = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -1994,8 +1973,6 @@ void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString Propert std::map SplitLength; std::map::iterator SLiter; - int intPref = 0; - PropertyType PropType = PROPERTY_NONE; // Look for type before continuing. @@ -2261,7 +2238,6 @@ void ContactDataObject::ProcessLanguage(wxString PropertySeg1, wxString Property std::map SplitLength; int intPrevValue = 6; - int intPref = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -2362,7 +2338,6 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper std::map SplitLength; int intPrevValue = 5; - int intPref = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -2479,8 +2454,6 @@ void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertyS int intSplitsFound = 0; int intSplitSize = 0; int intPrevValue = 9; - int intPref = 0; - long ListCtrlIndex; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -2663,9 +2636,6 @@ void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2, wxString PropertyTokens; bool FirstToken = TRUE; int intPrevValue = 5; - int intPref = 0; - int intType = 0; - long ListCtrlIndex; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -2790,9 +2760,6 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg wxString PropertyTokens; bool FirstToken = TRUE; int intPrevValue = 7; - int intPref = 0; - int intType = 0; - long ListCtrlIndex; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -2917,9 +2884,6 @@ void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2 wxString PropertyTokens; bool FirstToken = TRUE; int intPrevValue = 6; - int intPref = 0; - int intType = 0; - long ListCtrlIndex; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -3044,9 +3008,6 @@ void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString Prop wxString PropertyTokens; bool FirstToken = TRUE; int intPrevValue = 5; - int intPref = 0; - int intType = 0; - long ListCtrlIndex; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -3176,9 +3137,6 @@ void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2 wxString PropertyTokens; bool FirstToken = TRUE; int intPrevValue = 6; - int intPref = 0; - int intType = 0; - long ListCtrlIndex; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -3303,9 +3261,6 @@ void ContactDataObject::ProcessCategory(wxString PropertySeg1, wxString Property wxString PropertyTokens; bool FirstToken = TRUE; int intPrevValue = 12; - int intPref = 0; - int intType = 0; - long ListCtrlIndex; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -3559,8 +3514,6 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg int intSplitsFound = 0; int intSplitSize = 0; int intPrevValue = 7; - int intPref = 0; - int intType = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -3729,8 +3682,6 @@ void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2 int intSplitsFound = 0; int intSplitSize = 0; int intPrevValue = 6; - int intPref = 0; - int intType = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -3899,8 +3850,6 @@ void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg int intSplitsFound = 0; int intSplitSize = 0; int intPrevValue = 7; - int intPref = 0; - int intType = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -4070,8 +4019,6 @@ void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope int intSplitsFound = 0; int intSplitSize = 0; int intPrevValue = 8; - int intPref = 0; - int intType = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -4175,8 +4122,6 @@ void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxStrin int intSplitsFound = 0; int intSplitSize = 0; int intPrevValue = 8; - int intPref = 0; - int intType = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -4280,8 +4225,6 @@ void ContactDataObject::ProcessCalendarFreeBusy(wxString PropertySeg1, wxString int intSplitsFound = 0; int intSplitSize = 0; int intPrevValue = 7; - int intPref = 0; - int intType = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -4385,9 +4328,6 @@ void ContactDataObject::ProcessKey(wxString PropertySeg1, wxString PropertySeg2, int intSplitsFound = 0; int intSplitSize = 0; int intPrevValue = 5; - int intPref = 0; - int intType = 0; - long ListCtrlIndex; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -4563,7 +4503,6 @@ void ContactDataObject::ProcessVendor(wxString PropertySeg1, wxString PropertySe wxString wxSVNDID; wxString wxSVNDPropName; - long ListCtrlIndex; while (wSTVendorDetails.HasMoreTokens() == TRUE){ -- 2.39.2