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
@@ -1027,485 +1027,486 @@ void OContact::setChildren( const QString &str )
 */
 static inline VObject *safeAddPropValue( VObject *o, const char *prop, const QString &value )
 {
     VObject *ret = 0;
     if ( o && !value.isEmpty() )
         ret = addPropValue( o, prop, value.latin1() );
     return ret;
 }
 
 /*!
   \internal
 */
 static inline VObject *safeAddProp( VObject *o, const char *prop)
 {
     VObject *ret = 0;
     if ( o )
         ret = addProp( o, prop );
     return ret;
 }
 
 /*!
   \internal
 */
 static VObject *createVObject( const OContact &c )
 {
     VObject *vcard = newVObject( VCCardProp );
     safeAddPropValue( vcard, VCVersionProp, "2.1" );
     safeAddPropValue( vcard, VCLastRevisedProp, TimeConversion::toISO8601( QDateTime::currentDateTime() ) );
     safeAddPropValue( vcard, VCUniqueStringProp, QString::number(c.uid()) );
 
     // full name
     safeAddPropValue( vcard, VCFullNameProp, c.fullName() );
 
     // name properties
     VObject *name = safeAddProp( vcard, VCNameProp );
     safeAddPropValue( name, VCFamilyNameProp, c.lastName() );
     safeAddPropValue( name, VCGivenNameProp, c.firstName() );
     safeAddPropValue( name, VCAdditionalNamesProp, c.middleName() );
     safeAddPropValue( name, VCNamePrefixesProp, c.title() );
     safeAddPropValue( name, VCNameSuffixesProp, c.suffix() );
 
     // home properties
     VObject *home_adr= safeAddProp( vcard, VCAdrProp );
     safeAddProp( home_adr, VCHomeProp );
     safeAddPropValue( home_adr, VCStreetAddressProp, c.homeStreet() );
     safeAddPropValue( home_adr, VCCityProp, c.homeCity() );
     safeAddPropValue( home_adr, VCRegionProp, c.homeState() );
     safeAddPropValue( home_adr, VCPostalCodeProp, c.homeZip() );
     safeAddPropValue( home_adr, VCCountryNameProp, c.homeCountry() );
 
     VObject *home_phone = safeAddPropValue( vcard, VCTelephoneProp, c.homePhone() );
     safeAddProp( home_phone, VCHomeProp );
     home_phone = safeAddPropValue( vcard, VCTelephoneProp, c.homeMobile() );
     safeAddProp( home_phone, VCHomeProp );
     safeAddProp( home_phone, VCCellularProp );
     home_phone = safeAddPropValue( vcard, VCTelephoneProp, c.homeFax() );
     safeAddProp( home_phone, VCHomeProp );
     safeAddProp( home_phone, VCFaxProp );
 
     VObject *url = safeAddPropValue( vcard, VCURLProp, c.homeWebpage() );
     safeAddProp( url, VCHomeProp );
 
     // work properties
     VObject *work_adr= safeAddProp( vcard, VCAdrProp );
     safeAddProp( work_adr, VCWorkProp );
     safeAddPropValue( work_adr, VCStreetAddressProp, c.businessStreet() );
     safeAddPropValue( work_adr, VCCityProp, c.businessCity() );
     safeAddPropValue( work_adr, VCRegionProp, c.businessState() );
     safeAddPropValue( work_adr, VCPostalCodeProp, c.businessZip() );
     safeAddPropValue( work_adr, VCCountryNameProp, c.businessCountry() );
 
     VObject *work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessPhone() );
     safeAddProp( work_phone, VCWorkProp );
     work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessMobile() );
     safeAddProp( work_phone, VCWorkProp );
     safeAddProp( work_phone, VCCellularProp );
     work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessFax() );
     safeAddProp( work_phone, VCWorkProp );
     safeAddProp( work_phone, VCFaxProp );
     work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessPager() );
     safeAddProp( work_phone, VCWorkProp );
     safeAddProp( work_phone, VCPagerProp );
 
     url = safeAddPropValue( vcard, VCURLProp, c.businessWebpage() );
     safeAddProp( url, VCWorkProp );
 
     VObject *title = safeAddPropValue( vcard, VCTitleProp, c.jobTitle() );
     safeAddProp( title, VCWorkProp );
 
 
     QStringList emails = c.emailList();
     emails.prepend( c.defaultEmail() );
     for( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
         VObject *email = safeAddPropValue( vcard, VCEmailAddressProp, *it );
         safeAddProp( email, VCInternetProp );
     }
 
     safeAddPropValue( vcard, VCNoteProp, c.notes() );
 
     // Exporting Birthday regarding RFC 2425 (5.8.4)
     if ( c.birthday().isValid() ){
             QString birthd_rfc2425 = QString("%1-%2-%3")
                     .arg( c.birthday().year() )
                     .arg( c.birthday().month(), 2 )
                     .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 {
                         return QDate();
                 }
         }
         int y = datestr.left( monthPos ).toInt();
         int m = datestr.mid( monthPos + sep_ignore, dayPos - monthPos - sep_ignore ).toInt();
         int d = datestr.mid( dayPos + sep_ignore ).toInt();
         qDebug("TimeConversion::fromString ymd = %s => %d %d %d; mpos = %d ypos = %d", datestr.latin1(), y, m, d, monthPos, dayPos);
         QDate date ( y,m,d );
         return date;
 }
 
 static OContact parseVObject( VObject *obj )
 {
     OContact c;
 
     VObjectIterator it;
     initPropIterator( &it, obj );
     while( moreIteration( &it ) ) {
         VObject *o = nextVObject( &it );
         QCString name = vObjectName( o );
         QCString value = vObjectStringZValue( o );
         if ( name == VCNameProp ) {
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectTypeInfo( o );
                 QString value = vObjectStringZValue( o );
                 if ( name == VCNamePrefixesProp )
                     c.setTitle( value );
                 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 );
                 c.setHomeCountry( country );
                 c.setHomeZip( postal );
                 c.setHomeState( region );
             }
         }
         else if ( name == VCTelephoneProp ) {
             enum {
                 HOME = 0x01,
                 WORK = 0x02,
                 VOICE = 0x04,
                 CELL = 0x08,
                 FAX = 0x10,
                 PAGER = 0x20,
                 UNKNOWN = 0x80
             };
             int type = 0;
 
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectTypeInfo( o );
                 if ( name == VCHomeProp )
                     type |= HOME;
                 else if ( name == VCWorkProp )
                     type |= WORK;
                 else if ( name == VCVoiceProp )
                     type |= VOICE;
                 else if ( name == VCCellularProp )
                     type |= CELL;
                 else if ( name == VCFaxProp )
                     type |= FAX;
                 else if ( name == VCPagerProp )
                     type |= PAGER;
                 else  if ( name == VCPreferredProp )
                     ;
                 else
                     type |= UNKNOWN;
             }
             if ( (type & UNKNOWN) != UNKNOWN ) {
                 if ( ( type & (HOME|WORK) ) == 0 ) // default
                     type |= HOME;
                 if ( ( type & (VOICE|CELL|FAX|PAGER) ) == 0 ) // default
                     type |= VOICE;
 
                 if ( (type & (VOICE|HOME) ) == (VOICE|HOME) )
                     c.setHomePhone( value );
                 if ( ( type & (FAX|HOME) ) == (FAX|HOME) )
                     c.setHomeFax( value );
                 if ( ( type & (CELL|HOME) ) == (CELL|HOME) )
                     c.setHomeMobile( value );
                 if ( ( type & (VOICE|WORK) ) == (VOICE|WORK) )
                     c.setBusinessPhone( value );
                 if ( ( type & (FAX|WORK) ) == (FAX|WORK) )
                     c.setBusinessFax( value );
                 if ( ( type & (CELL|WORK) ) == (CELL|WORK) )
                     c.setBusinessMobile( value );
                 if ( ( type & (PAGER|WORK) ) == (PAGER|WORK) )
                     c.setBusinessPager( value );
             }
         }
         else if ( name == VCEmailAddressProp ) {
             QString email = vObjectStringZValue( o );
             bool valid = TRUE;
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectTypeInfo( o );
                 if ( name != VCInternetProp && name != VCHomeProp &&
                      name != VCWorkProp &&
                      name != VCPreferredProp )
                     // ### preffered should map to default email
                     valid = FALSE;
             }
             if ( valid ) {
                 c.insertEmail( email );
             }
         }
         else if ( name == VCURLProp ) {
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectTypeInfo( o );
                 if ( name == VCHomeProp )
                     c.setHomeWebpage( value );
                 else if ( name == VCWorkProp )
                     c.setBusinessWebpage( value );
             }
         }
         else if ( name == VCOrgProp ) {
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectName( o );
                 QString value = vObjectStringZValue( o );
                 if ( name == VCOrgNameProp )
                     c.setCompany( value );
                 else if ( name == VCOrgUnitProp )
                     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() );
             }
         }
 #endif
     }
     c.setFileAs();
     return c;
 }
 
 /*!
   Writes the list of \a contacts as a set of VCards to the file \a filename.
 */
 void OContact::writeVCard( const QString &filename, const QValueList<OContact> &contacts)
 {
         QFileDirect f( filename.utf8().data() );
         if ( !f.open( IO_WriteOnly ) ) {
                 qWarning("Unable to open vcard write");
                 return;
         }
 
     QValueList<OContact>::ConstIterator it;
     for( it = contacts.begin(); it != contacts.end(); ++it ) {
         VObject *obj = createVObject( *it );
         writeVObject(f.directHandle() , obj );
         cleanVObject( obj );
     }
     cleanStrTbl();
 }
 
 /*!
   writes \a contact as a VCard to the file \a filename.
 */
 void OContact::writeVCard( const QString &filename, const OContact &contact)
 {
         QFileDirect f( filename.utf8().data() );
         if ( !f.open( IO_WriteOnly ) ) {
                 qWarning("Unable to open vcard write");
                 return;
         }
 
     VObject *obj = createVObject( contact );
         writeVObject( f.directHandle() , obj );
         cleanVObject( obj );
 
         cleanStrTbl();
 }
 
 /*!
   Returns the set of contacts read as VCards from the file \a filename.
 */
 QValueList<OContact> OContact::readVCard( const QString &filename )
 {
     qDebug("trying to open %s, exists=%d", filename.utf8().data(), QFileInfo( filename.utf8().data() ).size() );
     VObject *obj = Parse_MIME_FromFileName( (char *)filename.utf8().data() );
 
     qDebug("vobject = %p", obj );
 
     QValueList<OContact> contacts;
 
     while ( obj ) {
         OContact con = parseVObject( obj );
         /*
          * if uid is 0 assign a new one
          * this at least happens on
          * Nokia6210
          */
         if ( con.uid() == 0 ){
             con.setUid( 1 );
             qWarning("assigned new uid %d",con.uid() );
         }
 
         contacts.append(con  );
 
         VObject *t = obj;
         obj = nextVObjectInList(obj);
         cleanVObject( t );
     }
 
     return contacts;
 }
 
 /*!
   Returns TRUE if the contact matches the regular expression \a regexp.
   Otherwise returns FALSE.
 */
 bool OContact::match( const QString &regexp ) const
 {
     return match(QRegExp(regexp));
 }
 
 /*!
   \overload
   Returns TRUE if the contact matches the regular expression \a regexp.
   Otherwise returns FALSE.
 */
 bool OContact::match( const QRegExp &r ) const
 {
     bool match;
     match = false;
     QMap<int, QString>::ConstIterator it;
     for ( it = mMap.begin(); it != mMap.end(); ++it ) {
         if ( (*it).find( r ) > -1 ) {
             match = true;
             break;
         }
     }
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
@@ -1027,485 +1027,486 @@ void OContact::setChildren( const QString &str )
 */
 static inline VObject *safeAddPropValue( VObject *o, const char *prop, const QString &value )
 {
     VObject *ret = 0;
     if ( o && !value.isEmpty() )
         ret = addPropValue( o, prop, value.latin1() );
     return ret;
 }
 
 /*!
   \internal
 */
 static inline VObject *safeAddProp( VObject *o, const char *prop)
 {
     VObject *ret = 0;
     if ( o )
         ret = addProp( o, prop );
     return ret;
 }
 
 /*!
   \internal
 */
 static VObject *createVObject( const OContact &c )
 {
     VObject *vcard = newVObject( VCCardProp );
     safeAddPropValue( vcard, VCVersionProp, "2.1" );
     safeAddPropValue( vcard, VCLastRevisedProp, TimeConversion::toISO8601( QDateTime::currentDateTime() ) );
     safeAddPropValue( vcard, VCUniqueStringProp, QString::number(c.uid()) );
 
     // full name
     safeAddPropValue( vcard, VCFullNameProp, c.fullName() );
 
     // name properties
     VObject *name = safeAddProp( vcard, VCNameProp );
     safeAddPropValue( name, VCFamilyNameProp, c.lastName() );
     safeAddPropValue( name, VCGivenNameProp, c.firstName() );
     safeAddPropValue( name, VCAdditionalNamesProp, c.middleName() );
     safeAddPropValue( name, VCNamePrefixesProp, c.title() );
     safeAddPropValue( name, VCNameSuffixesProp, c.suffix() );
 
     // home properties
     VObject *home_adr= safeAddProp( vcard, VCAdrProp );
     safeAddProp( home_adr, VCHomeProp );
     safeAddPropValue( home_adr, VCStreetAddressProp, c.homeStreet() );
     safeAddPropValue( home_adr, VCCityProp, c.homeCity() );
     safeAddPropValue( home_adr, VCRegionProp, c.homeState() );
     safeAddPropValue( home_adr, VCPostalCodeProp, c.homeZip() );
     safeAddPropValue( home_adr, VCCountryNameProp, c.homeCountry() );
 
     VObject *home_phone = safeAddPropValue( vcard, VCTelephoneProp, c.homePhone() );
     safeAddProp( home_phone, VCHomeProp );
     home_phone = safeAddPropValue( vcard, VCTelephoneProp, c.homeMobile() );
     safeAddProp( home_phone, VCHomeProp );
     safeAddProp( home_phone, VCCellularProp );
     home_phone = safeAddPropValue( vcard, VCTelephoneProp, c.homeFax() );
     safeAddProp( home_phone, VCHomeProp );
     safeAddProp( home_phone, VCFaxProp );
 
     VObject *url = safeAddPropValue( vcard, VCURLProp, c.homeWebpage() );
     safeAddProp( url, VCHomeProp );
 
     // work properties
     VObject *work_adr= safeAddProp( vcard, VCAdrProp );
     safeAddProp( work_adr, VCWorkProp );
     safeAddPropValue( work_adr, VCStreetAddressProp, c.businessStreet() );
     safeAddPropValue( work_adr, VCCityProp, c.businessCity() );
     safeAddPropValue( work_adr, VCRegionProp, c.businessState() );
     safeAddPropValue( work_adr, VCPostalCodeProp, c.businessZip() );
     safeAddPropValue( work_adr, VCCountryNameProp, c.businessCountry() );
 
     VObject *work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessPhone() );
     safeAddProp( work_phone, VCWorkProp );
     work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessMobile() );
     safeAddProp( work_phone, VCWorkProp );
     safeAddProp( work_phone, VCCellularProp );
     work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessFax() );
     safeAddProp( work_phone, VCWorkProp );
     safeAddProp( work_phone, VCFaxProp );
     work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessPager() );
     safeAddProp( work_phone, VCWorkProp );
     safeAddProp( work_phone, VCPagerProp );
 
     url = safeAddPropValue( vcard, VCURLProp, c.businessWebpage() );
     safeAddProp( url, VCWorkProp );
 
     VObject *title = safeAddPropValue( vcard, VCTitleProp, c.jobTitle() );
     safeAddProp( title, VCWorkProp );
 
 
     QStringList emails = c.emailList();
     emails.prepend( c.defaultEmail() );
     for( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
         VObject *email = safeAddPropValue( vcard, VCEmailAddressProp, *it );
         safeAddProp( email, VCInternetProp );
     }
 
     safeAddPropValue( vcard, VCNoteProp, c.notes() );
 
     // Exporting Birthday regarding RFC 2425 (5.8.4)
     if ( c.birthday().isValid() ){
             QString birthd_rfc2425 = QString("%1-%2-%3")
                     .arg( c.birthday().year() )
                     .arg( c.birthday().month(), 2 )
                     .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 {
                         return QDate();
                 }
         }
         int y = datestr.left( monthPos ).toInt();
         int m = datestr.mid( monthPos + sep_ignore, dayPos - monthPos - sep_ignore ).toInt();
         int d = datestr.mid( dayPos + sep_ignore ).toInt();
         qDebug("TimeConversion::fromString ymd = %s => %d %d %d; mpos = %d ypos = %d", datestr.latin1(), y, m, d, monthPos, dayPos);
         QDate date ( y,m,d );
         return date;
 }
 
 static OContact parseVObject( VObject *obj )
 {
     OContact c;
 
     VObjectIterator it;
     initPropIterator( &it, obj );
     while( moreIteration( &it ) ) {
         VObject *o = nextVObject( &it );
         QCString name = vObjectName( o );
         QCString value = vObjectStringZValue( o );
         if ( name == VCNameProp ) {
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectTypeInfo( o );
                 QString value = vObjectStringZValue( o );
                 if ( name == VCNamePrefixesProp )
                     c.setTitle( value );
                 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 );
                 c.setHomeCountry( country );
                 c.setHomeZip( postal );
                 c.setHomeState( region );
             }
         }
         else if ( name == VCTelephoneProp ) {
             enum {
                 HOME = 0x01,
                 WORK = 0x02,
                 VOICE = 0x04,
                 CELL = 0x08,
                 FAX = 0x10,
                 PAGER = 0x20,
                 UNKNOWN = 0x80
             };
             int type = 0;
 
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectTypeInfo( o );
                 if ( name == VCHomeProp )
                     type |= HOME;
                 else if ( name == VCWorkProp )
                     type |= WORK;
                 else if ( name == VCVoiceProp )
                     type |= VOICE;
                 else if ( name == VCCellularProp )
                     type |= CELL;
                 else if ( name == VCFaxProp )
                     type |= FAX;
                 else if ( name == VCPagerProp )
                     type |= PAGER;
                 else  if ( name == VCPreferredProp )
                     ;
                 else
                     type |= UNKNOWN;
             }
             if ( (type & UNKNOWN) != UNKNOWN ) {
                 if ( ( type & (HOME|WORK) ) == 0 ) // default
                     type |= HOME;
                 if ( ( type & (VOICE|CELL|FAX|PAGER) ) == 0 ) // default
                     type |= VOICE;
 
                 if ( (type & (VOICE|HOME) ) == (VOICE|HOME) )
                     c.setHomePhone( value );
                 if ( ( type & (FAX|HOME) ) == (FAX|HOME) )
                     c.setHomeFax( value );
                 if ( ( type & (CELL|HOME) ) == (CELL|HOME) )
                     c.setHomeMobile( value );
                 if ( ( type & (VOICE|WORK) ) == (VOICE|WORK) )
                     c.setBusinessPhone( value );
                 if ( ( type & (FAX|WORK) ) == (FAX|WORK) )
                     c.setBusinessFax( value );
                 if ( ( type & (CELL|WORK) ) == (CELL|WORK) )
                     c.setBusinessMobile( value );
                 if ( ( type & (PAGER|WORK) ) == (PAGER|WORK) )
                     c.setBusinessPager( value );
             }
         }
         else if ( name == VCEmailAddressProp ) {
             QString email = vObjectStringZValue( o );
             bool valid = TRUE;
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectTypeInfo( o );
                 if ( name != VCInternetProp && name != VCHomeProp &&
                      name != VCWorkProp &&
                      name != VCPreferredProp )
                     // ### preffered should map to default email
                     valid = FALSE;
             }
             if ( valid ) {
                 c.insertEmail( email );
             }
         }
         else if ( name == VCURLProp ) {
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectTypeInfo( o );
                 if ( name == VCHomeProp )
                     c.setHomeWebpage( value );
                 else if ( name == VCWorkProp )
                     c.setBusinessWebpage( value );
             }
         }
         else if ( name == VCOrgProp ) {
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectName( o );
                 QString value = vObjectStringZValue( o );
                 if ( name == VCOrgNameProp )
                     c.setCompany( value );
                 else if ( name == VCOrgUnitProp )
                     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() );
             }
         }
 #endif
     }
     c.setFileAs();
     return c;
 }
 
 /*!
   Writes the list of \a contacts as a set of VCards to the file \a filename.
 */
 void OContact::writeVCard( const QString &filename, const QValueList<OContact> &contacts)
 {
         QFileDirect f( filename.utf8().data() );
         if ( !f.open( IO_WriteOnly ) ) {
                 qWarning("Unable to open vcard write");
                 return;
         }
 
     QValueList<OContact>::ConstIterator it;
     for( it = contacts.begin(); it != contacts.end(); ++it ) {
         VObject *obj = createVObject( *it );
         writeVObject(f.directHandle() , obj );
         cleanVObject( obj );
     }
     cleanStrTbl();
 }
 
 /*!
   writes \a contact as a VCard to the file \a filename.
 */
 void OContact::writeVCard( const QString &filename, const OContact &contact)
 {
         QFileDirect f( filename.utf8().data() );
         if ( !f.open( IO_WriteOnly ) ) {
                 qWarning("Unable to open vcard write");
                 return;
         }
 
     VObject *obj = createVObject( contact );
         writeVObject( f.directHandle() , obj );
         cleanVObject( obj );
 
         cleanStrTbl();
 }
 
 /*!
   Returns the set of contacts read as VCards from the file \a filename.
 */
 QValueList<OContact> OContact::readVCard( const QString &filename )
 {
     qDebug("trying to open %s, exists=%d", filename.utf8().data(), QFileInfo( filename.utf8().data() ).size() );
     VObject *obj = Parse_MIME_FromFileName( (char *)filename.utf8().data() );
 
     qDebug("vobject = %p", obj );
 
     QValueList<OContact> contacts;
 
     while ( obj ) {
         OContact con = parseVObject( obj );
         /*
          * if uid is 0 assign a new one
          * this at least happens on
          * Nokia6210
          */
         if ( con.uid() == 0 ){
             con.setUid( 1 );
             qWarning("assigned new uid %d",con.uid() );
         }
 
         contacts.append(con  );
 
         VObject *t = obj;
         obj = nextVObjectInList(obj);
         cleanVObject( t );
     }
 
     return contacts;
 }
 
 /*!
   Returns TRUE if the contact matches the regular expression \a regexp.
   Otherwise returns FALSE.
 */
 bool OContact::match( const QString &regexp ) const
 {
     return match(QRegExp(regexp));
 }
 
 /*!
   \overload
   Returns TRUE if the contact matches the regular expression \a regexp.
   Otherwise returns FALSE.
 */
 bool OContact::match( const QRegExp &r ) const
 {
     bool match;
     match = false;
     QMap<int, QString>::ConstIterator it;
     for ( it = mMap.begin(); it != mMap.end(); ++it ) {
         if ( (*it).find( r ) > -1 ) {
             match = true;
             break;
         }
     }