1 files changed, 0 insertions, 26 deletions

diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
index af77a05..43e530a 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
@@ -158,63 +158,40 @@ OPimContact OPimContactAccessBackend_VCard::find ( int uid ) const
 QArray<int> OPimContactAccessBackend_VCard::allRecords() const
 {
     QArray<int> ar( m_map.count() );
     QMap<int, OPimContact>::ConstIterator it;
     int i = 0;
     for ( it = m_map.begin(); it != m_map.end(); ++it ) {
         ar[i] = it.key();
         i++;
     }
     return ar;
 }
 
-// Not implemented
-QArray<int> OPimContactAccessBackend_VCard::queryByExample ( const OPimContact&, int, const QDateTime& )
-{
-    QArray<int> ar(0);
-    return ar;
-}
-
-// Not implemented
-QArray<int> OPimContactAccessBackend_VCard::matchRegexp(  const QRegExp&  ) const
-{
-    QArray<int> ar(0);
-    return ar;
-}
-
 const uint OPimContactAccessBackend_VCard::querySettings()
 {
     return 0; // No search possible
 }
 
 bool OPimContactAccessBackend_VCard::hasQuerySettings (uint ) const
 {
     return false; // No search possible, therefore all settings invalid ;)
 }
 
 bool OPimContactAccessBackend_VCard::wasChangedExternally()
 {
     return false; // Don't expect concurrent access
 }
 
-// Not implemented
-QArray<int> OPimContactAccessBackend_VCard::sorted( bool , int, int, int )
-{
-    QArray<int> ar(0);
-    return ar;
-}
-
 // *** Private stuff ***
-
-
 OPimContact OPimContactAccessBackend_VCard::parseVObject( VObject *obj )
 {
     OPimContact c;
 
     VObjectIterator it;
     initPropIterator( &it, obj );
     while( moreIteration( &it ) ) {
 	    VObject *o = nextVObject( &it );
 	    QCString name = vObjectName( o );
 	    QString value = QString::fromUtf8( vObjectStringZValue( o ) );
 	    odebug << "(1)Read: %s" << QString( value ).latin1() << oendl;
 	    if ( name == VCNameProp ) {
@@ -311,25 +288,24 @@ OPimContact OPimContactAccessBackend_VCard::parseVObject( VObject *obj )
 				    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;
 			    
-			    owarn << "value %s %d" << value.data() << type << oendl;
 			    if ( (type & (VOICE|HOME) ) == (VOICE|HOME) && (type & (CELL|HOME) ) != (CELL|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) && (type & (CELL|WORK) ) != (CELL|WORK) )
 				    c.setBusinessPhone( value );
 			    if ( ( type & (FAX|WORK) ) == (FAX|WORK) )
 				    c.setBusinessFax( value );
 			    if ( ( type & (CELL|WORK) ) == (CELL|WORK) )
 				    c.setBusinessMobile( value );
@@ -516,44 +492,42 @@ VObject* OPimContactAccessBackend_VCard::createVObject( const OPimContact &c )
 
     QStringList emails = c.emailList();
     // emails.prepend( c.defaultEmail() ); Fix for bugreport #1045
     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() ){
-        owarn << "Exporting birthday as: " << convDateToVCardDate( c.birthday() ) << "" << oendl;
         safeAddPropValue( vcard, VCBirthDateProp, convDateToVCardDate( c.birthday() ) );
     }
 
     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() );
     if ( c.anniversary().isValid() ){
-        owarn << "Exporting anniversary as: " << convDateToVCardDate( c.anniversary() ) << "" << oendl;
         safeAddPropValue( vcard, "X-Qtopia-Anniversary", convDateToVCardDate( c.anniversary() ) );
     }
     safeAddPropValue( vcard, "X-Qtopia-Nickname", c.nickname() );
     safeAddPropValue( vcard, "X-Qtopia-Children", c.children() );
 
     return vcard;
 }
 
 QString OPimContactAccessBackend_VCard::convDateToVCardDate( const QDate& d ) const
 {
         QString str_rfc2425 = QString("%1-%2-%3")
             .arg( d.year() )