-rw-r--r-- | kaddressbook/kabcore.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 590cc82..ae0a068 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -428,5 +428,5 @@ KABCore::~KABCore() | |||
428 | void KABCore::receive( const QCString& cmsg, const QByteArray& data ) | 428 | void KABCore::receive( const QCString& cmsg, const QByteArray& data ) |
429 | { | 429 | { |
430 | qDebug("KA: QCOP message received: %s ", cmsg.data() ); | 430 | //qDebug("KA: QCOP message received: %s ", cmsg.data() ); |
431 | if ( cmsg == "setDocument(QString)" ) { | 431 | if ( cmsg == "setDocument(QString)" ) { |
432 | QDataStream stream( data, IO_ReadOnly ); | 432 | QDataStream stream( data, IO_ReadOnly ); |
@@ -443,5 +443,5 @@ void KABCore::toggleBeamReceive( ) | |||
443 | #ifndef DESKTOP_VERSION | 443 | #ifndef DESKTOP_VERSION |
444 | if ( infrared ) { | 444 | if ( infrared ) { |
445 | qDebug("AB disable BeamReceive "); | 445 | qDebug("KA: AB disable BeamReceive "); |
446 | delete infrared; | 446 | delete infrared; |
447 | infrared = 0; | 447 | infrared = 0; |
@@ -449,5 +449,5 @@ void KABCore::toggleBeamReceive( ) | |||
449 | return; | 449 | return; |
450 | } | 450 | } |
451 | qDebug("AB enable BeamReceive "); | 451 | qDebug("KA: AB enable BeamReceive "); |
452 | mActionBR->setChecked(true); | 452 | mActionBR->setChecked(true); |
453 | 453 | ||
@@ -569,5 +569,5 @@ void KABCore::saveSettings() | |||
569 | KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem(); | 569 | KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem(); |
570 | KABPrefs::instance()->writeConfig(); | 570 | KABPrefs::instance()->writeConfig(); |
571 | qDebug("KABCore::saveSettings() "); | 571 | qDebug("KA: KABCore::saveSettings() "); |
572 | } | 572 | } |
573 | 573 | ||
@@ -907,5 +907,5 @@ void KABCore::writeToPhone( ) | |||
907 | message(i18n("Export to phone finished!")); | 907 | message(i18n("Export to phone finished!")); |
908 | else | 908 | else |
909 | qDebug(i18n("Error exporting to phone")); | 909 | qDebug(i18n("KA: Error exporting to phone")); |
910 | } | 910 | } |
911 | void KABCore::beamVCard() | 911 | void KABCore::beamVCard() |
@@ -978,5 +978,5 @@ void KABCore::beamVCard(const QStringList& uids) | |||
978 | ir->send( fileName, description, "text/x-vCard" ); | 978 | ir->send( fileName, description, "text/x-vCard" ); |
979 | } else { | 979 | } else { |
980 | qDebug("Error open temp beam file "); | 980 | qDebug("KA: Error open temp beam file "); |
981 | return; | 981 | return; |
982 | } | 982 | } |
@@ -2685,5 +2685,5 @@ KABC::Addressee KABCore::getLastSyncAddressee() | |||
2685 | lse = mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice ); | 2685 | lse = mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice ); |
2686 | if (lse.isEmpty()) { | 2686 | if (lse.isEmpty()) { |
2687 | qDebug("Creating new last-syncAddressee "); | 2687 | qDebug("KA: Creating new last-syncAddressee "); |
2688 | lse.setUid( "last-syncAddressee-"+mCurrentSyncDevice ); | 2688 | lse.setUid( "last-syncAddressee-"+mCurrentSyncDevice ); |
2689 | QString sum = ""; | 2689 | QString sum = ""; |
@@ -2719,6 +2719,6 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i | |||
2719 | bool remCh, locCh; | 2719 | bool remCh, locCh; |
2720 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); | 2720 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); |
2721 | if ( remCh ) | 2721 | //if ( remCh ) |
2722 | qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); | 2722 | // qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); |
2723 | locCh = ( localMod > mLastAddressbookSync ); | 2723 | locCh = ( localMod > mLastAddressbookSync ); |
2724 | //qDebug("cahnged rem %d loc %d",remCh, locCh ); | 2724 | //qDebug("cahnged rem %d loc %d",remCh, locCh ); |
@@ -2857,12 +2857,12 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2857 | if ( KSyncManager::mRequestedSyncEvent.isValid() ) { | 2857 | if ( KSyncManager::mRequestedSyncEvent.isValid() ) { |
2858 | mLastAddressbookSync = KSyncManager::mRequestedSyncEvent; | 2858 | mLastAddressbookSync = KSyncManager::mRequestedSyncEvent; |
2859 | qDebug("using extern time for calendar sync: %s ", mLastAddressbookSync.toString().latin1() ); | 2859 | qDebug("KA: using extern time for calendar sync: %s ", mLastAddressbookSync.toString().latin1() ); |
2860 | } else { | 2860 | } else { |
2861 | qDebug("KSyncManager::mRequestedSyncEvent has invalid datatime "); | 2861 | qDebug("KA: KSyncManager::mRequestedSyncEvent has invalid datatime "); |
2862 | } | 2862 | } |
2863 | } | 2863 | } |
2864 | QDateTime modifiedCalendar = mLastAddressbookSync; | 2864 | QDateTime modifiedCalendar = mLastAddressbookSync; |
2865 | addresseeLSync = getLastSyncAddressee(); | 2865 | addresseeLSync = getLastSyncAddressee(); |
2866 | qDebug("Last Sync %s ", addresseeLSync.revision().toString().latin1()); | 2866 | qDebug("KA: Last Sync %s ", addresseeLSync.revision().toString().latin1()); |
2867 | addresseeR = remote->findByUid("last-syncAddressee-"+mCurrentSyncName ); | 2867 | addresseeR = remote->findByUid("last-syncAddressee-"+mCurrentSyncName ); |
2868 | if ( !addresseeR.isEmpty() ) { | 2868 | if ( !addresseeR.isEmpty() ) { |
@@ -3126,5 +3126,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
3126 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes, | 3126 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes, |
3127 | i18n("KA/Pi Synchronization"),i18n("Write back"))) { | 3127 | i18n("KA/Pi Synchronization"),i18n("Write back"))) { |
3128 | qDebug("cancelled "); | 3128 | qDebug("KA: WB cancelled "); |
3129 | return false; | 3129 | return false; |
3130 | } | 3130 | } |
@@ -3148,5 +3148,5 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode) | |||
3148 | bool syncOK = false; | 3148 | bool syncOK = false; |
3149 | if ( abLocal.load() ) { | 3149 | if ( abLocal.load() ) { |
3150 | qDebug("Sync:AB loaded %s,sync mode %d",filename.latin1(), mode ); | 3150 | qDebug("KA: Sync::AB loaded %s,sync mode %d",filename.latin1(), mode ); |
3151 | bool external = false; | 3151 | bool external = false; |
3152 | bool isXML = false; | 3152 | bool isXML = false; |
@@ -3158,5 +3158,5 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode) | |||
3158 | external = !manager->mIsKapiFile; | 3158 | external = !manager->mIsKapiFile; |
3159 | if ( external ) { | 3159 | if ( external ) { |
3160 | qDebug("Sync:Setting vcf mode to external "); | 3160 | qDebug("KA: Sync::Setting vcf mode to external "); |
3161 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 3161 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
3162 | AddressBook::Iterator it; | 3162 | AddressBook::Iterator it; |
@@ -3178,7 +3178,7 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode) | |||
3178 | if ( external ) | 3178 | if ( external ) |
3179 | abLocal.removeSyncAddressees( !isXML); | 3179 | abLocal.removeSyncAddressees( !isXML); |
3180 | qDebug("Sync:Saving remote AB "); | 3180 | qDebug("KA: Sync::Saving remote AB "); |
3181 | if ( ! abLocal.saveAB()) | 3181 | if ( ! abLocal.saveAB()) |
3182 | qDebug("Error writing back AB to file "); | 3182 | qDebug("KA: sync::Error writing back AB to file "); |
3183 | if ( external ) { | 3183 | if ( external ) { |
3184 | // afterwrite processing | 3184 | // afterwrite processing |
@@ -3198,5 +3198,5 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode) | |||
3198 | void KABCore::removeSyncInfo( QString syncProfile) | 3198 | void KABCore::removeSyncInfo( QString syncProfile) |
3199 | { | 3199 | { |
3200 | qDebug("AB:removeSyncInfo for profile %s ", syncProfile.latin1()); | 3200 | qDebug("KA: AB:removeSyncInfo for profile %s ", syncProfile.latin1()); |
3201 | mAddressBook->removeSyncInfo( syncProfile ); | 3201 | mAddressBook->removeSyncInfo( syncProfile ); |
3202 | setModified(); | 3202 | setModified(); |
@@ -3218,5 +3218,5 @@ bool KABCore::syncExternal(KSyncManager* manager, QString resource) | |||
3218 | message(i18n("Loading DTM address data..."), false); | 3218 | message(i18n("Loading DTM address data..."), false); |
3219 | if ( abLocal.load() ) { | 3219 | if ( abLocal.load() ) { |
3220 | qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1()); | 3220 | qDebug("KA: AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1()); |
3221 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 3221 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
3222 | message(i18n("Sync preprocessing..."),false); | 3222 | message(i18n("Sync preprocessing..."),false); |
@@ -3266,5 +3266,5 @@ bool KABCore::syncPhone() | |||
3266 | { | 3266 | { |
3267 | abLocal.importFromFile( fileName ); | 3267 | abLocal.importFromFile( fileName ); |
3268 | qDebug("AB phone loaded ,sync device %s",mCurrentSyncDevice.latin1()); | 3268 | qDebug("KA: AB phone loaded ,sync device %s",mCurrentSyncDevice.latin1()); |
3269 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 3269 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
3270 | abLocal.preparePhoneSync( mCurrentSyncDevice, true ); | 3270 | abLocal.preparePhoneSync( mCurrentSyncDevice, true ); |