author | zautrix <zautrix> | 2004-09-21 11:24:59 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-21 11:24:59 (UTC) |
commit | f66482cac98648a1e5ea21fddd55e6916f2a1c60 (patch) (unidiff) | |
tree | c51d30ac1fcb67572654a7a4d2d845b57618f61c | |
parent | ba89a5d20eb054054d9cfae3723a4d62b9f62efd (diff) | |
download | kdepimpi-f66482cac98648a1e5ea21fddd55e6916f2a1c60.zip kdepimpi-f66482cac98648a1e5ea21fddd55e6916f2a1c60.tar.gz kdepimpi-f66482cac98648a1e5ea21fddd55e6916f2a1c60.tar.bz2 |
latest fixes
-rw-r--r-- | kabc/plugins/file/resourcefile.cpp | 1 | ||||
-rw-r--r-- | kabc/plugins/sharpdtm/sharpdtmconverter.cpp | 6 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp index 6cd63fd..163f2b4 100644 --- a/kabc/plugins/file/resourcefile.cpp +++ b/kabc/plugins/file/resourcefile.cpp | |||
@@ -195,7 +195,6 @@ void ResourceFile::doClose() | |||
195 | bool ResourceFile::load() | 195 | bool ResourceFile::load() |
196 | { | 196 | { |
197 | 197 | ||
198 | qDebug("ResourceFile::loadfile %s ", mFileName.latin1()); | ||
199 | QFile file( mFileName ); | 198 | QFile file( mFileName ); |
200 | if ( !file.open( IO_ReadOnly ) ) { | 199 | if ( !file.open( IO_ReadOnly ) ) { |
201 | addressBook()->error( i18n( "Unable to open file '%1'." ).arg( mFileName ) ); | 200 | addressBook()->error( i18n( "Unable to open file '%1'." ).arg( mFileName ) ); |
diff --git a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp index d36df20..6418b54 100644 --- a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp +++ b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp | |||
@@ -312,7 +312,7 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da | |||
312 | // home | 312 | // home |
313 | const Address homeaddress = addr.address(Address::Home); | 313 | const Address homeaddress = addr.address(Address::Home); |
314 | if (!homeaddress.isEmpty()) { | 314 | if (!homeaddress.isEmpty()) { |
315 | qDebug("write home address "); | 315 | //qDebug("write home address "); |
316 | database->writeField(ZdbAdrs::HomeStreet, homeaddress.street()); | 316 | database->writeField(ZdbAdrs::HomeStreet, homeaddress.street()); |
317 | database->writeField(ZdbAdrs::HomeCity, homeaddress.locality()); | 317 | database->writeField(ZdbAdrs::HomeCity, homeaddress.locality()); |
318 | database->writeField(ZdbAdrs::HomeState, homeaddress.region()); | 318 | database->writeField(ZdbAdrs::HomeState, homeaddress.region()); |
@@ -340,7 +340,7 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da | |||
340 | // business | 340 | // business |
341 | const Address businessaddress = addr.address(Address::Work); | 341 | const Address businessaddress = addr.address(Address::Work); |
342 | if (!businessaddress.isEmpty()) { | 342 | if (!businessaddress.isEmpty()) { |
343 | qDebug("write business address "); | 343 | //qDebug("write business address "); |
344 | database->writeField(ZdbAdrs::BusinessStreet, businessaddress.street()); | 344 | database->writeField(ZdbAdrs::BusinessStreet, businessaddress.street()); |
345 | database->writeField(ZdbAdrs::BusinessCity, businessaddress.locality()); | 345 | database->writeField(ZdbAdrs::BusinessCity, businessaddress.locality()); |
346 | database->writeField(ZdbAdrs::BusinessState, businessaddress.region()); | 346 | database->writeField(ZdbAdrs::BusinessState, businessaddress.region()); |
@@ -429,7 +429,7 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da | |||
429 | QArray<int> iar; | 429 | QArray<int> iar; |
430 | if ( !cats.isEmpty() ) { | 430 | if ( !cats.isEmpty() ) { |
431 | QArray<int> iar = catDB->ids(cats); | 431 | QArray<int> iar = catDB->ids(cats); |
432 | qDebug("***cat count is %d ", iar.count()); | 432 | //qDebug("***cat count is %d ", iar.count()); |
433 | database->updateCategories(contact, iar); | 433 | database->updateCategories(contact, iar); |
434 | } | 434 | } |
435 | 435 | ||
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index c2f031a..4ebd6a8 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2555,16 +2555,16 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i | |||
2555 | bool remCh, locCh; | 2555 | bool remCh, locCh; |
2556 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); | 2556 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); |
2557 | 2557 | ||
2558 | qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); | 2558 | //qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); |
2559 | locCh = ( localMod > mLastAddressbookSync ); | 2559 | locCh = ( localMod > mLastAddressbookSync ); |
2560 | if ( !remCh && ! locCh ) { | 2560 | if ( !remCh && ! locCh ) { |
2561 | qDebug("both not changed "); | 2561 | //qDebug("both not changed "); |
2562 | lastSync = localMod.addDays(1); | 2562 | lastSync = localMod.addDays(1); |
2563 | if ( mode <= SYNC_PREF_ASK ) | 2563 | if ( mode <= SYNC_PREF_ASK ) |
2564 | return 0; | 2564 | return 0; |
2565 | } else { | 2565 | } else { |
2566 | if ( locCh ) { | 2566 | if ( locCh ) { |
2567 | qDebug("loc changed %s %s", localMod.toString().latin1(), mLastAddressbookSync.toString().latin1()); | 2567 | //qDebug("loc changed %s %s", localMod.toString().latin1(), mLastAddressbookSync.toString().latin1()); |
2568 | lastSync = localMod.addDays( -1 ); | 2568 | lastSync = localMod.addDays( -1 ); |
2569 | if ( !remCh ) | 2569 | if ( !remCh ) |
2570 | remoteMod =( lastSync.addDays( -1 ) ); | 2570 | remoteMod =( lastSync.addDays( -1 ) ); |