| -rw-r--r-- | kaddressbook/kabcore.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index b014cba..9041e45 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -2606,5 +2606,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo ++deletedAddresseeL; } else { - if ( ! KABPrefs::instance()->mWriteBackExistingOnly ) { + if ( ! syncManager->mWriteBackExistingOnly ) { inL.removeID(mCurrentSyncDevice ); ++addedAddresseeR; @@ -2623,5 +2623,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo ++deletedAddresseeL; } else { - if ( ! KABPrefs::instance()->mWriteBackExistingOnly ) { + if ( ! syncManager->mWriteBackExistingOnly ) { ++addedAddresseeR; inL.setRevision( modifiedCalendar ); @@ -2659,5 +2659,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo QString mes; mes .sprintf( i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR ); - if ( KABPrefs::instance()->mShowSyncSummary ) { + if ( syncManager->mShowSyncSummary ) { KMessageBox::information(this, mes, i18n("KA/Pi Synchronization") ); } @@ -2669,5 +2669,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo //this is a overwritten callbackmethods from the syncinterface bool KABCore::sync(KSyncManager* manager, QString filename, int mode) -{ +{ //pending prepare addresseeview for output @@ -2720,5 +2720,5 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode) syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode ); if ( syncOK ) { - if ( KABPrefs::instance()->mWriteBackFile ) + if ( syncManager->mWriteBackFile ) { if ( external ) @@ -2770,7 +2770,7 @@ bool KABCore::syncExternal(KSyncManager* manager, QString resource) abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice ); qDebug("KABCore::syncExternal: why do we acces here KABPrefs and not somehow KSyncProfile? "); - syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, KABPrefs::instance()->mSyncAlgoPrefs ); + syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); if ( syncOK ) { - if ( KABPrefs::instance()->mWriteBackFile ) { + if ( syncManager->mWriteBackFile ) { abLocal.saveAB(); abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ); |