temporarely deactivated anniversary in vcard

2 files changed, 6 insertions, 4 deletions

diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index 8a0930b..b0f0d7f 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -1131,49 +1131,49 @@ static VObject *createVObject( const OContact &c )
                     .arg( c.birthday().day(), 2 );
             // Now replace spaces with "0"...
             int pos = 0;
             while ( ( pos = birthd_rfc2425.find (' ')  ) > 0 )
                     birthd_rfc2425.replace( pos, 1, "0" );
 
             qWarning("Exporting birthday as: %s", birthd_rfc2425.latin1());
             safeAddPropValue( vcard, VCBirthDateProp, birthd_rfc2425.latin1() );
     }
 
     if ( !c.company().isEmpty() || !c.department().isEmpty() || !c.office().isEmpty() ) {
         VObject *org = safeAddProp( vcard, VCOrgProp );
         safeAddPropValue( org, VCOrgNameProp, c.company() );
         safeAddPropValue( org, VCOrgUnitProp, c.department() );
         safeAddPropValue( org, VCOrgUnit2Prop, c.office() );
     }
 
     // some values we have to export as custom fields
     safeAddPropValue( vcard, "X-Qtopia-Profession", c.profession() );
     safeAddPropValue( vcard, "X-Qtopia-Manager", c.manager() );
     safeAddPropValue( vcard, "X-Qtopia-Assistant", c.assistant() );
 
     safeAddPropValue( vcard, "X-Qtopia-Spouse", c.spouse() );
     safeAddPropValue( vcard, "X-Qtopia-Gender", c.gender() );
-    safeAddPropValue( vcard, "X-Qtopia-Anniversary", TimeConversion::toString( c.anniversary() ) );
+    // safeAddPropValue( vcard, "X-Qtopia-Anniversary", TimeConversion::toString( c.anniversary() ) ); :SX
     safeAddPropValue( vcard, "X-Qtopia-Nickname", c.nickname() );
     safeAddPropValue( vcard, "X-Qtopia-Children", c.children() );
 
     return vcard;
 }
 
 
 /*!
   \internal
 */
 static QDate convVCardDateToDate( const QString& datestr )
 {
         int monthPos = datestr.find('-');
         int dayPos = datestr.find('-', monthPos+1 );
         int sep_ignore = 1;
         if ( monthPos == -1 || dayPos == -1 ) {
                 qDebug("fromString didn't find - in str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos );
                 // Ok.. No "-" found, therefore we will try to read other format ( YYYYMMDD )
                 if ( datestr.length() == 8 ){
                         monthPos   = 4;
                         dayPos     = 6;
                         sep_ignore = 0;
                         qDebug("Try with follwing positions str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos );
                 } else {
@@ -1210,48 +1210,49 @@ static OContact parseVObject( VObject *obj )
                 else if ( name == VCNameSuffixesProp )
                     c.setSuffix( value );
                 else if ( name == VCFamilyNameProp )
                     c.setLastName( value );
                 else if ( name == VCGivenNameProp )
                     c.setFirstName( value );
                 else if ( name == VCAdditionalNamesProp )
                     c.setMiddleName( value );
             }
         }
         else if ( name == VCAdrProp ) {
             bool work = TRUE; // default address is work address
             QString street;
             QString city;
             QString region;
             QString postal;
             QString country;
 
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectName( o );
                 QString value = vObjectStringZValue( o );
+
                 if ( name == VCHomeProp )
                     work = FALSE;
                 else if ( name == VCWorkProp )
                     work = TRUE;
                 else if ( name == VCStreetAddressProp )
                     street = value;
                 else if ( name == VCCityProp )
                     city = value;
                 else if ( name == VCRegionProp )
                     region = value;
                 else if ( name == VCPostalCodeProp )
                     postal = value;
                 else if ( name == VCCountryNameProp )
                     country = value;
             }
             if ( work ) {
                 c.setBusinessStreet( street );
                 c.setBusinessCity( city );
                 c.setBusinessCountry( country );
                 c.setBusinessZip( postal );
                 c.setBusinessState( region );
             } else {
                 c.setHomeStreet( street );
                 c.setHomeCity( city );
@@ -1359,49 +1360,49 @@ static OContact parseVObject( VObject *obj )
                     c.setDepartment( value );
                 else if ( name == VCOrgUnit2Prop )
                     c.setOffice( value );
             }
         }
         else if ( name == VCTitleProp ) {
             c.setJobTitle( value );
         }
         else if ( name == "X-Qtopia-Profession" ) {
             c.setProfession( value );
         }
         else if ( name == "X-Qtopia-Manager" ) {
             c.setManager( value );
         }
         else if ( name == "X-Qtopia-Assistant" ) {
             c.setAssistant( value );
         }
         else if ( name == "X-Qtopia-Spouse" ) {
             c.setSpouse( value );
         }
         else if ( name == "X-Qtopia-Gender" ) {
             c.setGender( value );
         }
         else if ( name == "X-Qtopia-Anniversary" ) {
-            c.setAnniversary( TimeConversion::fromString( value ) );
+        //     c.setAnniversary( TimeConversion::fromString( value ) ); :SX
         }
         else if ( name == "X-Qtopia-Nickname" ) {
             c.setNickname( value );
         }
         else if ( name == "X-Qtopia-Children" ) {
             c.setChildren( value );
         }
         else if ( name == VCBirthDateProp ) {
                 // Reading Birthdate regarding RFC 2425 (5.8.4)
                 c.setBirthday( convVCardDateToDate( value ) );
 
         }
 
 #if 0
         else {
             printf("Name: %s, value=%s\n", name.data(), vObjectStringZValue( o ) );
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectName( o );
                 QString value = vObjectStringZValue( o );
                 printf(" subprop: %s = %s\n", name.data(), value.latin1() );
             }
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index 8a0930b..b0f0d7f 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -1131,49 +1131,49 @@ static VObject *createVObject( const OContact &c )
                     .arg( c.birthday().day(), 2 );
             // Now replace spaces with "0"...
             int pos = 0;
             while ( ( pos = birthd_rfc2425.find (' ')  ) > 0 )
                     birthd_rfc2425.replace( pos, 1, "0" );
 
             qWarning("Exporting birthday as: %s", birthd_rfc2425.latin1());
             safeAddPropValue( vcard, VCBirthDateProp, birthd_rfc2425.latin1() );
     }
 
     if ( !c.company().isEmpty() || !c.department().isEmpty() || !c.office().isEmpty() ) {
         VObject *org = safeAddProp( vcard, VCOrgProp );
         safeAddPropValue( org, VCOrgNameProp, c.company() );
         safeAddPropValue( org, VCOrgUnitProp, c.department() );
         safeAddPropValue( org, VCOrgUnit2Prop, c.office() );
     }
 
     // some values we have to export as custom fields
     safeAddPropValue( vcard, "X-Qtopia-Profession", c.profession() );
     safeAddPropValue( vcard, "X-Qtopia-Manager", c.manager() );
     safeAddPropValue( vcard, "X-Qtopia-Assistant", c.assistant() );
 
     safeAddPropValue( vcard, "X-Qtopia-Spouse", c.spouse() );
     safeAddPropValue( vcard, "X-Qtopia-Gender", c.gender() );
-    safeAddPropValue( vcard, "X-Qtopia-Anniversary", TimeConversion::toString( c.anniversary() ) );
+    // safeAddPropValue( vcard, "X-Qtopia-Anniversary", TimeConversion::toString( c.anniversary() ) ); :SX
     safeAddPropValue( vcard, "X-Qtopia-Nickname", c.nickname() );
     safeAddPropValue( vcard, "X-Qtopia-Children", c.children() );
 
     return vcard;
 }
 
 
 /*!
   \internal
 */
 static QDate convVCardDateToDate( const QString& datestr )
 {
         int monthPos = datestr.find('-');
         int dayPos = datestr.find('-', monthPos+1 );
         int sep_ignore = 1;
         if ( monthPos == -1 || dayPos == -1 ) {
                 qDebug("fromString didn't find - in str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos );
                 // Ok.. No "-" found, therefore we will try to read other format ( YYYYMMDD )
                 if ( datestr.length() == 8 ){
                         monthPos   = 4;
                         dayPos     = 6;
                         sep_ignore = 0;
                         qDebug("Try with follwing positions str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos );
                 } else {
@@ -1210,48 +1210,49 @@ static OContact parseVObject( VObject *obj )
                 else if ( name == VCNameSuffixesProp )
                     c.setSuffix( value );
                 else if ( name == VCFamilyNameProp )
                     c.setLastName( value );
                 else if ( name == VCGivenNameProp )
                     c.setFirstName( value );
                 else if ( name == VCAdditionalNamesProp )
                     c.setMiddleName( value );
             }
         }
         else if ( name == VCAdrProp ) {
             bool work = TRUE; // default address is work address
             QString street;
             QString city;
             QString region;
             QString postal;
             QString country;
 
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectName( o );
                 QString value = vObjectStringZValue( o );
+
                 if ( name == VCHomeProp )
                     work = FALSE;
                 else if ( name == VCWorkProp )
                     work = TRUE;
                 else if ( name == VCStreetAddressProp )
                     street = value;
                 else if ( name == VCCityProp )
                     city = value;
                 else if ( name == VCRegionProp )
                     region = value;
                 else if ( name == VCPostalCodeProp )
                     postal = value;
                 else if ( name == VCCountryNameProp )
                     country = value;
             }
             if ( work ) {
                 c.setBusinessStreet( street );
                 c.setBusinessCity( city );
                 c.setBusinessCountry( country );
                 c.setBusinessZip( postal );
                 c.setBusinessState( region );
             } else {
                 c.setHomeStreet( street );
                 c.setHomeCity( city );
@@ -1359,49 +1360,49 @@ static OContact parseVObject( VObject *obj )
                     c.setDepartment( value );
                 else if ( name == VCOrgUnit2Prop )
                     c.setOffice( value );
             }
         }
         else if ( name == VCTitleProp ) {
             c.setJobTitle( value );
         }
         else if ( name == "X-Qtopia-Profession" ) {
             c.setProfession( value );
         }
         else if ( name == "X-Qtopia-Manager" ) {
             c.setManager( value );
         }
         else if ( name == "X-Qtopia-Assistant" ) {
             c.setAssistant( value );
         }
         else if ( name == "X-Qtopia-Spouse" ) {
             c.setSpouse( value );
         }
         else if ( name == "X-Qtopia-Gender" ) {
             c.setGender( value );
         }
         else if ( name == "X-Qtopia-Anniversary" ) {
-            c.setAnniversary( TimeConversion::fromString( value ) );
+        //     c.setAnniversary( TimeConversion::fromString( value ) ); :SX
         }
         else if ( name == "X-Qtopia-Nickname" ) {
             c.setNickname( value );
         }
         else if ( name == "X-Qtopia-Children" ) {
             c.setChildren( value );
         }
         else if ( name == VCBirthDateProp ) {
                 // Reading Birthdate regarding RFC 2425 (5.8.4)
                 c.setBirthday( convVCardDateToDate( value ) );
 
         }
 
 #if 0
         else {
             printf("Name: %s, value=%s\n", name.data(), vObjectStringZValue( o ) );
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectName( o );
                 QString value = vObjectStringZValue( o );
                 printf(" subprop: %s = %s\n", name.data(), value.latin1() );
             }