1 files changed, 3 insertions, 3 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index ed3ac84..f9e4387 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -272,372 +272,372 @@ void AddressBook::init(const QString &config, const QString &family )
 //    qDebug("AddressBook::init 1  config=%s",config.latin1() );
   }
   else {
     d->mConfig = 0;
 //    qDebug("AddressBook::init 1  config=0");
   }
 
 //US  d->mErrorHandler = 0;
   d->mManager = new KRES::Manager<Resource>( fami );
   d->mManager->readConfig( d->mConfig );
   if ( family == "syncContact" ) {
       KRES::Manager<Resource> *manager = d->mManager;
       KRES::Manager<Resource>::ActiveIterator it;
       for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
           (*it)->setAddressBook( this );
           if ( !(*it)->open() )
               error( QString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) );
       }
       Resource *res = standardResource();
       if ( !res ) {
           qDebug("ERROR: no standard resource");
           res = manager->createResource( "file" );
           if ( res )
               {
                   addResource( res );
               }
           else
               qDebug(" No resource available!!!");
       }
       setStandardResource( res );
       manager->writeConfig();
   }
   addCustomField( i18n( "Department" ), KABC::Field::Organization,
                                 "X-Department", "KADDRESSBOOK" );
   addCustomField( i18n( "Profession" ), KABC::Field::Organization,
                                 "X-Profession", "KADDRESSBOOK" );
   addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization,
                                 "X-AssistantsName", "KADDRESSBOOK" );
   addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization,
                                 "X-ManagersName", "KADDRESSBOOK" );
   addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal,
                                 "X-SpousesName", "KADDRESSBOOK" );
   addCustomField( i18n( "Office" ), KABC::Field::Personal,
                                 "X-Office", "KADDRESSBOOK" );
   addCustomField( i18n( "IM Address" ), KABC::Field::Personal,
                                 "X-IMAddress", "KADDRESSBOOK" );
   addCustomField( i18n( "Anniversary" ), KABC::Field::Personal,
                                 "X-Anniversary", "KADDRESSBOOK" );
 
   //US added this field to become compatible with Opie/qtopia addressbook
   // values can be "female" or "male" or "". An empty field represents undefined.
   addCustomField( i18n( "Gender" ), KABC::Field::Personal,
                                 "X-Gender", "KADDRESSBOOK" );
   addCustomField( i18n( "Children" ), KABC::Field::Personal,
                                 "X-Children", "KADDRESSBOOK" );
   addCustomField( i18n( "FreeBusyUrl" ), KABC::Field::Personal,
                                 "X-FreeBusyUrl", "KADDRESSBOOK" );
   addCustomField( i18n( "ExternalID" ), KABC::Field::Personal,
                                 "X-ExternalID", "KADDRESSBOOK" );
 }
 
 AddressBook::~AddressBook()
 {
   delete d->mConfig; d->mConfig = 0;
   delete d->mManager; d->mManager = 0;
 //US  delete d->mErrorHandler; d->mErrorHandler = 0;
   delete d; d = 0;
 }
 
 bool AddressBook::load()
 {
 
   clear();
   KRES::Manager<Resource>::ActiveIterator it;
   bool ok = true;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it )
     if ( !(*it)->load() ) {
       qDebug( i18n("Unable to load resource '%1'").arg( (*it)->resourceName() ) );
       ok = false;
     } else {
       qDebug( i18n("Resource loaded: '%1'").arg( (*it)->resourceName() ) );
     }
   // mark all addressees as unchanged
   Addressee::List::Iterator addrIt;
   for ( addrIt = d->mAddressees.begin(); addrIt != d->mAddressees.end(); ++addrIt ) {
     (*addrIt).setChanged( false );
     QString id = (*addrIt).custom( "KADDRESSBOOK", "X-ExternalID" );
     if ( !id.isEmpty() ) {
         //qDebug("setId aa %s ", id.latin1());
         (*addrIt).setIDStr(id );
     }
   }
   blockLSEchange = true;
   return ok;
 }
 
 bool AddressBook::save( Ticket *ticket )
 {
   kdDebug(5700) << "AddressBook::save()"<< endl;
 
   if ( ticket->resource() ) {
     deleteRemovedAddressees();
     return ticket->resource()->save( ticket );
   }
 
   return false;
 }
 // exports all Addressees, which are syncable
 void  AddressBook::export2File( QString fileName, QString resourceName )
 {
   
   QFile outFile( fileName );
   if ( !outFile.open( IO_WriteOnly ) ) {
     QString text = i18n( "<qt>Unable to open file <b>%1</b> for export.</qt>" );
     KMessageBox::error( 0, text.arg( fileName ) );
     return ;
   }
   QTextStream t( &outFile );
   t.setEncoding( QTextStream::UnicodeUTF8 );
   Iterator it;
   KABC::VCardConverter::Version version;
   version = KABC::VCardConverter::v3_0;
   for ( it = begin(); it != end(); ++it ) { 
       if ( (*it).resource()  ) {
           bool include = (*it).resource()->includeInSync();
           if ( !resourceName.isEmpty()  )
               include = (resourceName == (*it).resource()->resourceName() );
           if ( include ) {
-              qDebug(QString ("Exporting resource %1 to file %2").arg( (*it).resource()->name() ).arg( fileName ) );
+              //qDebug(QString ("Exporting resource %1 to file %2").arg( (*it).resource()->resourceName() ).arg( fileName ) );
               if ( !(*it).IDStr().isEmpty() ) {
                   (*it).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*it).IDStr() );
               }
               KABC::VCardConverter converter;
               QString vcard; 
               //Resource *resource() const;
               converter.addresseeToVCard( *it, vcard, version );
               t << vcard << "\r\n";
           }
       }
   }
   t <<  "\r\n\r\n";
   outFile.close(); 
 }
 // if QStringList uids is empty, all are exported
 bool  AddressBook::export2PhoneFormat( QStringList uids ,QString fileName )
 {
   KABC::VCardConverter converter;
   QString datastream;
   Iterator it; 
   bool all = uids.isEmpty();
   for ( it = begin(); it != end(); ++it ) {
       // for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
       if ( ! all ) {
           if ( ! ( uids.contains((*it).uid() ) ))
               continue;
       } 
       KABC::Addressee a = ( *it );
       if ( a.isEmpty() )
           continue;
       if ( all && a.resource() && !a.resource()->includeInSync() )
           continue;
       a.simplifyEmails();
       a.simplifyPhoneNumbers();
       a.simplifyPhoneNumberTypes();
       a.simplifyAddresses();
 
       QString vcard;
       QString vcardnew;
       converter.addresseeToVCard( a, vcard );
       int start = 0;
       int next;
       while ( (next = vcard.find("TYPE=", start) )>= 0 ) {
           int semi = vcard.find(";", next);
           int dopp = vcard.find(":", next);
           int sep;
           if ( semi < dopp && semi >= 0 )
               sep = semi ;
           else
               sep = dopp;
           vcardnew +=vcard.mid( start, next - start);
           vcardnew +=vcard.mid( next+5,sep -next -5 ).upper();
           start = sep;
       }
       vcardnew += vcard.mid( start,vcard.length() );
       vcard = "";
       start = 0;
       while ( (next = vcardnew.find("ADR", start) )>= 0 ) {
           int sep = vcardnew.find(":", next);
           vcard +=vcardnew.mid( start, next - start+3);
           start = sep;
       }
       vcard += vcardnew.mid( start,vcardnew.length() );
       vcard.replace ( QRegExp(";;;") , "" );
       vcard.replace ( QRegExp(";;") , "" );
       datastream += vcard;
      
   }
   
   QFile outFile(fileName);
   if ( outFile.open(IO_WriteOnly) ) { 
       datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" );
       QTextStream t( &outFile );  // use a text stream
       t.setEncoding( QTextStream::UnicodeUTF8 );
       t <<datastream;
       t <<  "\r\n\r\n";
       outFile.close();
           
   } else {
       qDebug("Error open temp file ");
       return false;
   }
   return true;
 
 }
 int  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool removeOld, QString resource   )
 {
 
     if ( removeOld )
         setUntagged( true, resource );
     KABC::Addressee::List list;
     QFile file( fileName );
     file.open( IO_ReadOnly );
     QByteArray rawData = file.readAll();
     file.close();
     QString data;
     if ( replaceLabel ) { 
         data = QString::fromLatin1( rawData.data(), rawData.size() + 1 ); 
         data.replace ( QRegExp("LABEL") , "ADR" );
         data.replace ( QRegExp("CHARSET=ISO-8859-1") , "" );
     } else
         data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); 
     KABC::VCardTool tool;
     list =  tool.parseVCards( data );
     KABC::Addressee::List::Iterator it;
 
     Resource * setRes = 0;
     if ( !resource.isEmpty() ) {
         KRES::Manager<Resource>::ActiveIterator it;
         KRES::Manager<Resource> *manager = d->mManager;
         for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
-            qDebug("SaveAB::checking resource..." );
+            //qDebug("SaveAB::checking resource..." );
             if ( (*it)->resourceName() == resource  ) {
                 setRes = (*it);
-                qDebug("Inserting imported contacs to resource %s", resource.latin1());
+                qDebug("KA: AB: Inserting imported contacs to resource %s", resource.latin1());
                 break;
             }
         }
     }
     for ( it = list.begin(); it != list.end(); ++it ) {
         QString id = (*it).custom( "KADDRESSBOOK", "X-ExternalID" );
         if ( !id.isEmpty() ) 
             (*it).setIDStr(id );
         (*it).setResource(  setRes );
         if ( replaceLabel )
             (*it).removeVoice();
         if ( removeOld )
             (*it).setTagged( true );
         insertAddressee( (*it), false, true );
     }
     if ( removeOld )
         removeUntagged();
     return list.count();
 }
 void AddressBook::setUntagged(bool setNonSyncTagged, QString resource) // = false , "")
 {
     Iterator ait;
     if ( !resource.isEmpty() ) {
         for ( ait = begin(); ait != end(); ++ait ) {
             if ( (*ait).resource() && (*ait).resource()->resourceName() == resource ) {
                 (*ait).setTagged( false );
             }
             else
                 (*ait).setTagged( true );
         }
     } else {
         for ( ait = begin(); ait != end(); ++ait ) {
             if ( setNonSyncTagged ) {
                 if ( (*ait).resource() && ! (*ait).resource()->includeInSync() ) {
                     (*ait).setTagged( true );
                 } else
                     (*ait).setTagged( false );
             } else
                 (*ait).setTagged( false );
         }
     }
 }
 void AddressBook::removeUntagged()
 {
   Iterator ait;
   bool todelete = false;
   Iterator todel;
   for ( ait = begin(); ait != end(); ++ait ) {
       if ( todelete )
           removeAddressee( todel );
       if (!(*ait).tagged()) {
           todelete = true;
           todel = ait;
       } else
           todelete = false;
   } 
   if ( todelete )
       removeAddressee( todel );
   deleteRemovedAddressees();
 }
 void AddressBook::smplifyAddressees() 
 {
     Iterator ait;
     for ( ait = begin(); ait != end(); ++ait ) {
         (*ait).simplifyEmails();
         (*ait).simplifyPhoneNumbers();
         (*ait).simplifyPhoneNumberTypes();
         (*ait).simplifyAddresses();
     }
 }
 void AddressBook::removeSyncInfo( QString syncProfile)
 {
     Iterator ait;
     for ( ait = begin(); ait != end(); ++ait ) {
         (*ait).removeID( syncProfile );
     } 
     if ( syncProfile.isEmpty() ) {
         Iterator it = begin();
         Iterator it2 ;
         while ( it != end() ) {
             if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) {
                 it2 = it;
                 //qDebug("removing %s ",(*it).uid().latin1() );
                 ++it;
                 removeAddressee( it2 );
             } else  {
                 //qDebug("skipping %s ",(*it).uid().latin1() );
                 ++it;
             }
         }
     } else { 
         Addressee lse;
         lse =  findByUid( "last-syncAddressee-"+ syncProfile );
         if ( ! lse.isEmpty() )
             removeAddressee( lse );  
     }
 
 }
 void AddressBook::preparePhoneSync( QString currentSyncDevice, bool isPreSync )
 {
     Iterator ait;
     for ( ait = begin(); ait != end(); ++ait ) {
         QString id = (*ait).IDStr();
         (*ait).setIDStr( ":");
         (*ait).setExternalUID( id );
         (*ait).setOriginalExternalUID( id ); 
         if ( isPreSync )
             (*ait).setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
         else {
             (*ait).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
             (*ait).setID( currentSyncDevice,id );
             
         }
     }
 }
 void AddressBook::findNewExtIds(  QString fileName, QString currentSyncDevice  )
 {
  
     setUntagged();
     KABC::Addressee::List list;
     QFile file( fileName );
     file.open( IO_ReadOnly );
     QByteArray rawData = file.readAll();
     file.close();
     QString data;
 
     data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); 
     KABC::VCardTool tool;