X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2Fcdo%2FContactDataObject.cpp;h=1449286d162cfead08ff32c7e0881bdb23659a90;hb=d57580c160153c18c9d191b1a18841687ff3c36c;hp=c017406e7eff2e095d8d3fc72c6b582c732af6cb;hpb=359a26624e3487e39a6ec969416c49ca1d17ad96;p=xestiaab%2F.git

diff --git a/source/contacteditor/cdo/ContactDataObject.cpp b/source/contacteditor/cdo/ContactDataObject.cpp
index c017406..1449286 100644
--- a/source/contacteditor/cdo/ContactDataObject.cpp
+++ b/source/contacteditor/cdo/ContactDataObject.cpp
@@ -460,7 +460,6 @@ void ContactDataObject::ProcessRevision(wxString PropertySeg1, wxString Property
 
 	// Process the revision date.
 	
-	size_t intPropertyLen = PropertySeg1.Len();
 	std::map<int, int> SplitPoints;
 	std::map<int, int> SplitLength;
 	std::map<int, int>::iterator SLiter;			
@@ -469,8 +468,6 @@ void ContactDataObject::ProcessRevision(wxString PropertySeg1, wxString Property
 	wxString PropertyValue;
 	wxString PropertyTokens;
 	bool FirstToken = TRUE;
-	int intSplitsFound = 0;
-	int intSplitSize = 0;
 	int intPrevValue = 5;
 	
 	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
@@ -525,7 +522,6 @@ void ContactDataObject::ProcessSource(wxString PropertySeg1, wxString PropertySe
 
 	// Process the source address.
 	
-	size_t intPropertyLen = PropertySeg1.Len();
 	std::map<int, int> SplitPoints;
 	std::map<int, int> SplitLength;
 	std::map<int, int>::iterator SLiter;			
@@ -535,8 +531,6 @@ void ContactDataObject::ProcessSource(wxString PropertySeg1, wxString PropertySe
 	wxString PropertyTokens;
 	bool FirstToken = TRUE;
 	bool PropertyMatched = FALSE;
-	int intSplitsFound = 0;
-	int intSplitSize = 0;
 	int intPrevValue = 8;
 	
 	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
@@ -597,11 +591,8 @@ void ContactDataObject::ProcessSource(wxString PropertySeg1, wxString PropertySe
 	
 	}	
 	
-	intPropertyLen = PropertySeg2.Len();
 	SplitPoints.clear();
 	SplitLength.clear();
-	intSplitsFound = 0;
-	intSplitSize = 0;
 	intPrevValue = 0;
 	
 	CaptureString(&PropertySeg2, FALSE);
@@ -647,7 +638,6 @@ void ContactDataObject::ProcessXML(wxString PropertySeg1, wxString PropertySeg2,
 	wxString PropertyData;
 	wxString PropertyTokens;
 	std::map<int,int>::iterator SLiter;
-	bool FirstToken = TRUE;
 	bool PropertyMatched = FALSE;
 	
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
@@ -949,7 +939,6 @@ void ContactDataObject::ProcessClientPIDMap(wxString PropertySeg1, wxString Prop
 
 	// Process the Client PID Map.
 	
-	size_t intPropertyLen = PropertySeg1.Len();
 	std::map<int, int> SplitPoints;
 	std::map<int, int> SplitLength;
 	std::map<int, int>::iterator SLiter;			
@@ -958,8 +947,6 @@ void ContactDataObject::ProcessClientPIDMap(wxString PropertySeg1, wxString Prop
 	wxString PropertyValue;
 	wxString PropertyTokens;
 	bool FirstToken = TRUE;
-	int intSplitsFound = 0;
-	int intSplitSize = 0;
 	int intPrevValue = 14;
 	
 	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
@@ -2038,7 +2025,6 @@ void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString Propert
 	int intSplitSize = 0;
 	int intSplitsFound = 0;
 	int intSplitPoint = 0;
-	int intType = 0;
 	int intPrevValue = 5;
 		
 	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
@@ -2137,15 +2123,11 @@ void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString Propert
 				if (TypePropertyName == wxT("home") && TypeFound == FALSE){
 				
 					PropType = PROPERTY_HOME;
-					TelTypeUI.Append("home");
-					intTypeSeek++;
 					TypeFound = TRUE;
 				
 				} else if (TypePropertyName == wxT("work") && TypeFound == FALSE){
 				
 					PropType = PROPERTY_WORK;
-					TelTypeUI.Append("work");
-					intTypeSeek++;
 					TypeFound = TRUE;
 						
 				}
@@ -2533,7 +2515,6 @@ void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertyS
 
 	// Process the relation.
 	
-	size_t intPropertyLen = PropertySeg1.Len();
 	std::map<int, int> SplitPoints;
 	std::map<int, int> SplitLength;
 	std::map<int, int>::iterator SLiter;			
@@ -2545,8 +2526,6 @@ void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertyS
 	wxString RelatedTypeOriginal;			
 	wxString RelatedName;
 	bool FirstToken = TRUE;			
-	int intSplitsFound = 0;
-	int intSplitSize = 0;
 	int intPrevValue = 9;
 	
 	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
@@ -4130,8 +4109,6 @@ void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope
 	wxString PropertyValue;
 	wxString PropertyTokens;
 	bool FirstToken = TRUE;
-	int intSplitsFound = 0;
-	int intSplitSize = 0;
 	int intPrevValue = 8;
 	
 	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
@@ -4190,11 +4167,8 @@ void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope
 	
 	}	
 	
-	intPropertyLen = PropertySeg2.Len();
 	SplitPoints.clear();
 	SplitLength.clear();
-	intSplitsFound = 0;
-	intSplitSize = 0;
 	intPrevValue = 0;
 	
 	CaptureString(&PropertySeg2, FALSE);
@@ -4225,8 +4199,7 @@ void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope
 void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxString PropertySeg2, int *CalAdrURICount){
 
 	// Process the calendar address URI.
-	
-	size_t intPropertyLen = PropertySeg1.Len();
+
 	std::map<int, int> SplitPoints;
 	std::map<int, int> SplitLength;
 	std::map<int, int>::iterator SLiter;			
@@ -4235,8 +4208,6 @@ void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxStrin
 	wxString PropertyValue;
 	wxString PropertyTokens;
 	bool FirstToken = TRUE;
-	int intSplitsFound = 0;
-	int intSplitSize = 0;
 	int intPrevValue = 8;
 	
 	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
@@ -4295,11 +4266,8 @@ void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxStrin
 	
 	}	
 	
-	intPropertyLen = PropertySeg2.Len();
 	SplitPoints.clear();
 	SplitLength.clear();
-	intSplitsFound = 0;
-	intSplitSize = 0;
 	intPrevValue = 0;
 	
 	CaptureString(&PropertySeg2, FALSE);
@@ -4340,8 +4308,6 @@ void ContactDataObject::ProcessCalendarFreeBusy(wxString PropertySeg1, wxString
 	wxString PropertyValue;
 	wxString PropertyTokens;
 	bool FirstToken = TRUE;
-	int intSplitsFound = 0;
-	int intSplitSize = 0;
 	int intPrevValue = 7;
 	
 	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
@@ -4403,8 +4369,6 @@ void ContactDataObject::ProcessCalendarFreeBusy(wxString PropertySeg1, wxString
 	intPropertyLen = PropertySeg2.Len();
 	SplitPoints.clear();
 	SplitLength.clear();
-	intSplitsFound = 0;
-	intSplitSize = 0;
 	intPrevValue = 0;
 	
 	CaptureString(&PropertySeg2, FALSE);
@@ -4435,8 +4399,7 @@ void ContactDataObject::ProcessCalendarFreeBusy(wxString PropertySeg1, wxString
 void ContactDataObject::ProcessKey(wxString PropertySeg1, wxString PropertySeg2, int *KeyCount){
 
 	// Process the key.
-	
-	size_t intPropertyLen = PropertySeg1.Len();
+
 	std::map<int, int> SplitPoints;
 	std::map<int, int> SplitLength;
 	std::map<int, int>::iterator SLiter;			
@@ -4502,7 +4465,7 @@ void ContactDataObject::ProcessKey(wxString PropertySeg1, wxString PropertySeg2,
 	
 	}				
 	
-	intPropertyLen = PropertySeg2.Len();
+	size_t intPropertyLen = PropertySeg2.Len();
 	SplitPoints.clear();
 	SplitLength.clear();
 	intSplitsFound = 0;