X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fvcard%2Fvcard34conv-v3conv.cpp;h=362ed8568a6bbc4e84d668ed3ac1791aa60bd473;hb=f69e09d827e06435ea94bb73aa71ab5f9d5c035b;hp=67d69e9fa1337ebebfdb3c28417f00614259abfe;hpb=495bcb79429e110e722da3102707e9a9b8cb2b72;p=xestiaab%2F.git

diff --git a/source/vcard/vcard34conv-v3conv.cpp b/source/vcard/vcard34conv-v3conv.cpp
index 67d69e9..362ed85 100644
--- a/source/vcard/vcard34conv-v3conv.cpp
+++ b/source/vcard/vcard34conv-v3conv.cpp
@@ -78,12 +78,9 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
 
 	bool QuoteMode = FALSE;
 	bool PropertyFind = TRUE;
-	bool HasExtraNicknames = FALSE;
-	bool IgnoreGender = FALSE;
 	bool ExtraLineSeek = TRUE;
 	bool BirthdayProcessed = FALSE;
 	bool AnniversaryProcessed = FALSE;
-	bool FNProcessed = FALSE;
 	bool GenderProcessed = FALSE;
 	bool NameProcessed = FALSE;
 	bool KindProcessed = FALSE;
@@ -93,40 +90,12 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
 	bool OrganisationFirst = FALSE;
 	bool NoteFirst = FALSE;
 	bool PhotoFirst = FALSE;
-	bool LogoFirst = FALSE;
-	int intExtraNickname = 0;
 	wxString wxSProperty;
 	wxString wxSPropertySeg1;
 	wxString wxSPropertySeg2;
 	wxString wxSPropertyNextLine;
 	size_t ContactLineLen = 0;
 	int QuoteBreakPoint = 0;
-	int FNCount = 0;
-	int NameCount = 0;
-	int NicknameCount = 0;
-	int ADRCount = 0;
-	int EmailCount = 0;
-	int IMPPCount = 0;
-	int TelCount = 0;
-	int LangCount = 0;
-	int TZCount = 0;
-	int GeoCount = 0;
-	int URLCount = 0;
-	int RelatedCount = 0;
-	int TitleCount = 0;
-	int RoleCount = 0;
-	int OrgCount = 0;
-	int NoteCount = 0;
-	int CategoryCount = 0;
-	int PhotoCount = 0;
-	int LogoCount = 0;
-	int SoundCount = 0;
-	int CalAdrCount = 0;
-	int CalReqAdrCount = 0;
-	int FreeBusyCount = 0;
-	int KeyCount = 0;
-	int VendorCount = 0;
-	int XTokenCount = 0;
 	int ItemSeek = 1;
 	
 	wxString strVer;
@@ -307,9 +276,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
 			wxString PropertyName;
 			wxString PropertyValue;
 			wxString PropertyTokens;
-			int intPrevValue = 5;
-
-			intPrevValue = 4;
 		
 			ContactDatav3.AddRaw(wxT("X-ADDRESSBOOKSERVER-KIND"), wxSPropertySeg2);
 		
@@ -326,9 +292,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
 			wxString PropertyName;
 			wxString PropertyValue;
 			wxString PropertyTokens;
-			int intPrevValue = 7;
-
-			intPrevValue = 6;
 
 			ContactDatav3.AddRaw(wxT("X-ADDRESSBOOKSERVER-MEMBER"), wxSPropertySeg2);
 		
@@ -746,7 +709,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
 			int intSplitsFound = 0;
 			int intSplitSize = 0;
 			int intPrevValue = 5;
-			int intType = 0;
 			int intSplitPoint = 0;
 
 			intPrevValue = 4;
@@ -845,16 +807,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
 							TelTypeUI.Append(wxT(","));							
 						
 						}
-					
-						if (TypePropertyName == wxT("home")){
-						
-							intType = 1;
-						
-						} else if (TypePropertyName == wxT("work")){
-						
-							intType = 2;
-						
-						}
 						
 						if (TypePropertyName == wxT("text")){