author | zautrix <zautrix> | 2004-09-14 02:04:12 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-14 02:04:12 (UTC) |
commit | 5060b0737c0c279859cac3bcfb73d2ac21c6a79e (patch) (unidiff) | |
tree | 8de6965559cb5bd6eba1eea5c635315d0945cfd1 | |
parent | 739fec31c8cea89dd40ff1ce7dd7b84b05e4e973 (diff) | |
download | kdepimpi-5060b0737c0c279859cac3bcfb73d2ac21c6a79e.zip kdepimpi-5060b0737c0c279859cac3bcfb73d2ac21c6a79e.tar.gz kdepimpi-5060b0737c0c279859cac3bcfb73d2ac21c6a79e.tar.bz2 |
debug off
-rw-r--r-- | korganizer/calendarview.cpp | 6 | ||||
-rw-r--r-- | libkcal/sharpformat.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index ce41fbd..5a6d615 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -733,18 +733,18 @@ int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , b | |||
733 | qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); | 733 | qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); |
734 | locCh = ( local->lastModified() > mLastCalendarSync ); | 734 | locCh = ( local->lastModified() > mLastCalendarSync ); |
735 | //qDebug("locCh %d remCh %d locuid %d remuid %d", locCh, remCh,local->zaurusUid(), remote->zaurusUid() ); | 735 | //qDebug("locCh %d remCh %d locuid %d remuid %d", locCh, remCh,local->zaurusUid(), remote->zaurusUid() ); |
736 | if ( !remCh && ! locCh ) { | 736 | if ( !remCh && ! locCh ) { |
737 | qDebug("both not changed "); | 737 | //qDebug("both not changed "); |
738 | lastSync = local->lastModified().addDays(1); | 738 | lastSync = local->lastModified().addDays(1); |
739 | } else { | 739 | } else { |
740 | if ( locCh ) { | 740 | if ( locCh ) { |
741 | qDebug("loc changed %d %s %s", local->revision() , local->lastModified().toString().latin1(), mLastCalendarSync.toString().latin1()); | 741 | // qDebug("loc changed %d %s %s", local->revision() , local->lastModified().toString().latin1(), mLastCalendarSync.toString().latin1()); |
742 | lastSync = local->lastModified().addDays( -1 ); | 742 | lastSync = local->lastModified().addDays( -1 ); |
743 | if ( !remCh ) | 743 | if ( !remCh ) |
744 | remote->setLastModified( lastSync.addDays( -1 ) ); | 744 | remote->setLastModified( lastSync.addDays( -1 ) ); |
745 | } else { | 745 | } else { |
746 | qDebug(" not loc changed "); | 746 | //qDebug(" not loc changed "); |
747 | lastSync = local->lastModified().addDays( 1 ); | 747 | lastSync = local->lastModified().addDays( 1 ); |
748 | if ( remCh ) | 748 | if ( remCh ) |
749 | remote->setLastModified( lastSync.addDays( 1 ) ); | 749 | remote->setLastModified( lastSync.addDays( 1 ) ); |
750 | 750 | ||
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp index 89eb72f..a53b3f8 100644 --- a/libkcal/sharpformat.cpp +++ b/libkcal/sharpformat.cpp | |||
@@ -368,10 +368,10 @@ ulong SharpFormat::getCsum( const QStringList & attList) | |||
368 | return cSum; | 368 | return cSum; |
369 | 369 | ||
370 | } | 370 | } |
371 | #include <stdlib.h> | 371 | #include <stdlib.h> |
372 | //#define DEBUGMODE false | 372 | #define DEBUGMODE false |
373 | #define DEBUGMODE true | 373 | //#define DEBUGMODE true |
374 | bool SharpFormat::load( Calendar *calendar, Calendar *existngCal ) | 374 | bool SharpFormat::load( Calendar *calendar, Calendar *existngCal ) |
375 | { | 375 | { |
376 | 376 | ||
377 | 377 | ||