Removed commented out code from vcard/vcard34conv-v3conv.cpp

[xestiaab/.git] / source / vcard / vcard34conv-v3conv.cpp

diff --git a/source/vcard/vcard34conv-v3conv.cpp b/source/vcard/vcard34conv-v3conv.cpp
index 9e3f59a..67d69e9 100644 (file)
--- a/source/vcard/vcard34conv-v3conv.cpp
+++ b/source/vcard/vcard34conv-v3conv.cpp
@@ -40,8 +40,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
 
        vCard ContactDatav3;
        
-       //wxSContactFilename = Filename;
-       
        // Check if we are using wxWidgets version 2.8 or less and
        // execute the required command accordingly.
        
@@ -130,11 +128,10 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
        int VendorCount = 0;
        int XTokenCount = 0;
        int ItemSeek = 1;
-       //int intValueSeek = 1;
        
        wxString strVer;
     
-    // Setup the version string.
+       // Setup the version string.
        
        strVer.Append(wxT("-//Xestia//Address Book Version "));
        strVer.Append(wxT(XSDAB_VERSION));
@@ -171,8 +168,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
                        if (wxSPropertyNextLine.Mid(0, 1) == wxT(" ") || wxSPropertyNextLine.Mid(0, 1) == wxT("\t")){
                
                                wxSPropertyNextLine.Remove(0, 1);
-                               //wxSPropertyNextLine.Trim(FALSE);
-                               //ContactLine.Trim();
                                ContactLine.Append(wxSPropertyNextLine);
                
                        } else {
@@ -243,8 +238,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
                        wxString PropertyValue;
                        wxString PropertyTokens;
                        int intPrevValue = 4;
-
-                       //SplitValues(&wxSPropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
                        
                        intPrevValue = 3;
                        
@@ -913,8 +906,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
                                                
                                                } else if (TypePropertyName == wxT("textphone")){
                                                
-                                                       //if (!TelTypeOut.IsEmpty()){ TelTypeOut.Append(wxT(";")); }
-                                               
                                                        if (!FinalFriendlyString.IsEmpty()){  FinalFriendlyString.Append(_(", Textphone")); } else { FinalFriendlyString.Append(_("Textphone")); }
                                                
                                                        TelTypeOut.Append(wxT(";"));
@@ -1719,7 +1710,7 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
                        
                        int intPrevValue = 14;
                        
-                       intPrevValue = ;
+                       intPrevValue = 12;
                        
                        if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
                         
@@ -1735,9 +1726,9 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
                
                        // Process the XML values.
                        
-                       int intPrevValue = 14;
+                       int intPrevValue = 5;
                        
-                       intPrevValue = ;
+                       intPrevValue = 3;
                        
                        if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
                         
@@ -1747,7 +1738,25 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
                         
                                ContactDatav3.AddRaw(wxT("X-VCARD4-XML;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
 
-                       }       
+                       }
+               
+               } else if (wxSProperty.Mid(0, 6) == wxT("SOURCE")){
+               
+                       // Process the source links.
+                       
+                       int intPrevValue = 8;
+                       
+                       intPrevValue = 6;
+                       
+                       if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
+                        
+                               ContactDatav3.AddRaw(wxT("X-VCARD4-SOURCE"), wxSPropertySeg2);
+
+                       } else {
+                        
+                               ContactDatav3.AddRaw(wxT("X-VCARD4-SOURCE;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
+
+                       }
                
                }