From 102cc4a711e303372efea9797623ee2d9f27f63c Mon Sep 17 00:00:00 2001 From: zautrix Date: Fri, 29 Oct 2004 14:01:58 +0000 Subject: removed debug output --- (limited to 'kaddressbook/kabcore.cpp') diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 6e482b5..e6bdde9 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -2242,7 +2242,7 @@ void KABCore::requestForBirthdayList(const QString& sourceChannel, const QString assembledNameList.append((*it).assembledName()); uidList.append((*it).uid()); - qDebug("found birthday in KA/Pi: %s,%s,%s,%s: %s, %s", (*it).realName().latin1(), (*it).preferredEmail().latin1(), (*it).assembledName().latin1(), (*it).uid().latin1(), formattedbday.latin1(), anni.latin1() ); + //qDebug("found birthday in KA/Pi: %s,%s,%s,%s: %s, %s", (*it).realName().latin1(), (*it).preferredEmail().latin1(), (*it).assembledName().latin1(), (*it).uid().latin1(), formattedbday.latin1(), anni.latin1() ); } } @@ -2254,7 +2254,7 @@ void KABCore::requestForBirthdayList(const QString& sourceChannel, const QString */ void KABCore::requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid) { - qDebug("KABCore::requestForDetails %s %s %s %s %s", sourceChannel.latin1(), sessionuid.latin1(), name.latin1(), email.latin1(), uid.latin1()); + //qDebug("KABCore::requestForDetails %s %s %s %s %s", sourceChannel.latin1(), sessionuid.latin1(), name.latin1(), email.latin1(), uid.latin1()); QString foundUid = QString::null; if ( ! uid.isEmpty() ) { @@ -2289,7 +2289,7 @@ void KABCore::requestForDetails(const QString& sourceChannel, const QString& ses if (!email.isEmpty()) emaillist = mAddressBook->findByEmail( email ); - qDebug("count %d %d ", namelist.count(),emaillist.count() ); + //qDebug("count %d %d ", namelist.count(),emaillist.count() ); //check if we have a match in Namelist and Emaillist if ((namelist.count() == 0) && (emaillist.count() > 0)) { foundUid = emaillist[0].uid(); @@ -2406,24 +2406,24 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { bool remCh, locCh; remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); - qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); + //qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); locCh = ( localMod > mLastAddressbookSync ); if ( !remCh && ! locCh ) { - qDebug("both not changed "); + //qDebug("both not changed "); lastSync = localMod.addDays(1); if ( mode <= SYNC_PREF_ASK ) return 0; } else { if ( locCh ) { - qDebug("loc changed %s %s", localMod.toString().latin1(), mLastAddressbookSync.toString().latin1()); + //qDebug("loc changed %s %s", localMod.toString().latin1(), mLastAddressbookSync.toString().latin1()); lastSync = localMod.addDays( -1 ); if ( !remCh ) remoteMod =( lastSync.addDays( -1 ) ); } else { - qDebug(" not loc changed "); + //qDebug(" not loc changed "); lastSync = localMod.addDays( 1 ); if ( remCh ) { - qDebug("rem changed "); + //qDebug("rem changed "); remoteMod =( lastSync.addDays( 1 ) ); } @@ -2437,13 +2437,13 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i return 0; } - qDebug("%s %s --- %d %d", localMod.toString().latin1() , remoteMod.toString().latin1(), localMod.time().msec(), remoteMod.time().msec()); - qDebug("lastsync %s ", lastSync.toString().latin1() ); + //qDebug("%s %s --- %d %d", localMod.toString().latin1() , remoteMod.toString().latin1(), localMod.time().msec(), remoteMod.time().msec()); + //qDebug("lastsync %s ", lastSync.toString().latin1() ); //full = true; //debug only if ( full ) { bool equ = ( (*local) == (*remote) ); if ( equ ) { - qDebug("equal "); + //qDebug("equal "); if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) ); } @@ -2556,7 +2556,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { addresseeRSync = addresseeLSync ; } else { - qDebug("FULLDATE 1"); + //qDebug("FULLDATE 1"); fullDateRange = true; Addressee newAdd; addresseeRSync = newAdd; @@ -2567,7 +2567,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo } } if ( addresseeLSync.revision() == mLastAddressbookSync ) { - qDebug("FULLDATE 2"); + // qDebug("FULLDATE 2"); fullDateRange = true; } if ( ! fullDateRange ) { @@ -2576,7 +2576,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo // qDebug("set fulldate to true %s %s" ,addresseeLSync->dtStart().toString().latin1(), addresseeRSync->dtStart().toString().latin1() ); //qDebug("%d %d %d %d ", addresseeLSync->dtStart().time().second(), addresseeLSync->dtStart().time().msec() , addresseeRSync->dtStart().time().second(), addresseeRSync->dtStart().time().msec()); fullDateRange = true; - qDebug("FULLDATE 3 %s %s", addresseeLSync.revision().toString().latin1() , addresseeRSync.revision().toString().latin1() ); + //qDebug("FULLDATE 3 %s %s", addresseeLSync.revision().toString().latin1() , addresseeRSync.revision().toString().latin1() ); } } // fullDateRange = true; // debug only! @@ -2856,6 +2856,7 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode) setModified(); } + abLocal.removeResources(); if ( syncOK ) mViewManager->refreshView(); return syncOK; @@ -2894,6 +2895,7 @@ bool KABCore::syncExternal(KSyncManager* manager, QString resource) message( i18n("Sync cancelled or failed.") ); setModified(); } + abLocal.removeResources(); if ( syncOK ) mViewManager->refreshView(); disableBR( false ); @@ -2933,6 +2935,7 @@ bool KABCore::syncPhone() } setModified(); } + abLocal.removeResources(); if ( syncOK ) mViewManager->refreshView(); return syncOK; -- cgit v0.9.0.2