author | zautrix <zautrix> | 2004-10-17 16:06:42 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-17 16:06:42 (UTC) |
commit | d92f58ffa1937af8a4240b9d235da15f5f352769 (patch) (unidiff) | |
tree | 48768599988f33c7f20017a76d05e919fa77ac51 | |
parent | 711c4c06a7d1a52b97fd24efa3586543f46cc6d7 (diff) | |
download | kdepimpi-d92f58ffa1937af8a4240b9d235da15f5f352769.zip kdepimpi-d92f58ffa1937af8a4240b9d235da15f5f352769.tar.gz kdepimpi-d92f58ffa1937af8a4240b9d235da15f5f352769.tar.bz2 |
KDE sync fixes
-rw-r--r-- | kde2file/caldump/main.cpp | 7 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 8 | ||||
-rw-r--r-- | libkcal/calendar.cpp | 16 | ||||
-rw-r--r-- | libkcal/calendar.h | 1 |
4 files changed, 32 insertions, 0 deletions
diff --git a/kde2file/caldump/main.cpp b/kde2file/caldump/main.cpp index 03571b9..755e792 100644 --- a/kde2file/caldump/main.cpp +++ b/kde2file/caldump/main.cpp | |||
@@ -167,2 +167,3 @@ int main( int argc, char *argv[] ) | |||
167 | for( it = newInc.begin(); it != newInc.end(); ++it ) { | 167 | for( it = newInc.begin(); it != newInc.end(); ++it ) { |
168 | if ( (*it)->pilotId() > 0 ) { //changed | ||
168 | Incidence* cl = (*it)->clone(); | 169 | Incidence* cl = (*it)->clone(); |
@@ -173,2 +174,3 @@ int main( int argc, char *argv[] ) | |||
173 | if ( res ) { | 174 | if ( res ) { |
175 | cl->setPilotId( incOld->pilotId() ); | ||
174 | ++num; | 176 | ++num; |
@@ -202,2 +204,7 @@ int main( int argc, char *argv[] ) | |||
202 | } | 204 | } |
205 | } else { // added | ||
206 | Incidence* cl = (*it)->clone(); | ||
207 | calendarResource->addIncidence( cl ); | ||
208 | ++add; | ||
209 | } | ||
203 | } | 210 | } |
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 1f8ad5b..f727cd4 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -934,2 +934,7 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
934 | local->resetTempSyncStat(); | 934 | local->resetTempSyncStat(); |
935 | #ifdef DESKTOP_VERSION | ||
936 | //Needed for KDE - OL sync | ||
937 | local->resetPilotStat(); | ||
938 | remote->resetPilotStat(); | ||
939 | #endif | ||
935 | mLastCalendarSync = QDateTime::currentDateTime(); | 940 | mLastCalendarSync = QDateTime::currentDateTime(); |
@@ -1028,2 +1033,5 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1028 | remote->addIncidence( inR ); | 1033 | remote->addIncidence( inR ); |
1034 | #ifdef DESKTOP_VERSION | ||
1035 | inR->setPilotId( 1 ); | ||
1036 | #endif | ||
1029 | ++changedRemote; | 1037 | ++changedRemote; |
diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp index a3977d7..eeb5f48 100644 --- a/libkcal/calendar.cpp +++ b/libkcal/calendar.cpp | |||
@@ -250,2 +250,18 @@ QPtrList<Incidence> Calendar::incidences() | |||
250 | } | 250 | } |
251 | |||
252 | void Calendar::resetPilotStat() | ||
253 | { | ||
254 | QPtrList<Incidence> incidences; | ||
255 | |||
256 | Incidence *i; | ||
257 | |||
258 | QPtrList<Event> e = rawEvents(); | ||
259 | for( i = e.first(); i; i = e.next() ) i->setPilotId( 0 ); | ||
260 | |||
261 | QPtrList<Todo> t = rawTodos(); | ||
262 | for( i = t.first(); i; i = t.next() ) i->setPilotId( 0 ); | ||
263 | |||
264 | QPtrList<Journal> j = journals(); | ||
265 | for( i = j.first(); i; i = j.next() ) i->setPilotId( 0 ); | ||
266 | } | ||
251 | void Calendar::resetTempSyncStat() | 267 | void Calendar::resetTempSyncStat() |
diff --git a/libkcal/calendar.h b/libkcal/calendar.h index c45d81f..d5294eb 100644 --- a/libkcal/calendar.h +++ b/libkcal/calendar.h | |||
@@ -69,2 +69,3 @@ public: | |||
69 | void resetTempSyncStat(); | 69 | void resetTempSyncStat(); |
70 | void resetPilotStat(); | ||
70 | /** | 71 | /** |