author | zautrix <zautrix> | 2004-10-17 18:08:43 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-17 18:08:43 (UTC) |
commit | 6f6d1d58938539215bb4fcb5b97cf9fb089a11ef (patch) (unidiff) | |
tree | 9937fe24c3fa3f29421b39a58b393e893a11636a /libkcal | |
parent | d92f58ffa1937af8a4240b9d235da15f5f352769 (diff) | |
download | kdepimpi-6f6d1d58938539215bb4fcb5b97cf9fb089a11ef.zip kdepimpi-6f6d1d58938539215bb4fcb5b97cf9fb089a11ef.tar.gz kdepimpi-6f6d1d58938539215bb4fcb5b97cf9fb089a11ef.tar.bz2 |
more KDE sync fixes
-rw-r--r-- | libkcal/calendar.cpp | 8 | ||||
-rw-r--r-- | libkcal/calendar.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp index eeb5f48..52daaaa 100644 --- a/libkcal/calendar.cpp +++ b/libkcal/calendar.cpp | |||
@@ -236,46 +236,46 @@ QPtrList<Incidence> Calendar::incidences() | |||
236 | QPtrList<Incidence> incidences; | 236 | QPtrList<Incidence> incidences; |
237 | 237 | ||
238 | Incidence *i; | 238 | Incidence *i; |
239 | 239 | ||
240 | QPtrList<Event> e = events(); | 240 | QPtrList<Event> e = events(); |
241 | for( i = e.first(); i; i = e.next() ) incidences.append( i ); | 241 | for( i = e.first(); i; i = e.next() ) incidences.append( i ); |
242 | 242 | ||
243 | QPtrList<Todo> t = todos(); | 243 | QPtrList<Todo> t = todos(); |
244 | for( i = t.first(); i; i = t.next() ) incidences.append( i ); | 244 | for( i = t.first(); i; i = t.next() ) incidences.append( i ); |
245 | 245 | ||
246 | QPtrList<Journal> j = journals(); | 246 | QPtrList<Journal> j = journals(); |
247 | for( i = j.first(); i; i = j.next() ) incidences.append( i ); | 247 | for( i = j.first(); i; i = j.next() ) incidences.append( i ); |
248 | 248 | ||
249 | return incidences; | 249 | return incidences; |
250 | } | 250 | } |
251 | 251 | ||
252 | void Calendar::resetPilotStat() | 252 | void Calendar::resetPilotStat(int id ) |
253 | { | 253 | { |
254 | QPtrList<Incidence> incidences; | 254 | QPtrList<Incidence> incidences; |
255 | 255 | ||
256 | Incidence *i; | 256 | Incidence *i; |
257 | 257 | ||
258 | QPtrList<Event> e = rawEvents(); | 258 | QPtrList<Event> e = rawEvents(); |
259 | for( i = e.first(); i; i = e.next() ) i->setPilotId( 0 ); | 259 | for( i = e.first(); i; i = e.next() ) i->setPilotId( id ); |
260 | 260 | ||
261 | QPtrList<Todo> t = rawTodos(); | 261 | QPtrList<Todo> t = rawTodos(); |
262 | for( i = t.first(); i; i = t.next() ) i->setPilotId( 0 ); | 262 | for( i = t.first(); i; i = t.next() ) i->setPilotId( id ); |
263 | 263 | ||
264 | QPtrList<Journal> j = journals(); | 264 | QPtrList<Journal> j = journals(); |
265 | for( i = j.first(); i; i = j.next() ) i->setPilotId( 0 ); | 265 | for( i = j.first(); i; i = j.next() ) i->setPilotId( id ); |
266 | } | 266 | } |
267 | void Calendar::resetTempSyncStat() | 267 | void Calendar::resetTempSyncStat() |
268 | { | 268 | { |
269 | QPtrList<Incidence> incidences; | 269 | QPtrList<Incidence> incidences; |
270 | 270 | ||
271 | Incidence *i; | 271 | Incidence *i; |
272 | 272 | ||
273 | QPtrList<Event> e = rawEvents(); | 273 | QPtrList<Event> e = rawEvents(); |
274 | for( i = e.first(); i; i = e.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); | 274 | for( i = e.first(); i; i = e.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); |
275 | 275 | ||
276 | QPtrList<Todo> t = rawTodos(); | 276 | QPtrList<Todo> t = rawTodos(); |
277 | for( i = t.first(); i; i = t.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); | 277 | for( i = t.first(); i; i = t.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); |
278 | 278 | ||
279 | QPtrList<Journal> j = journals(); | 279 | QPtrList<Journal> j = journals(); |
280 | for( i = j.first(); i; i = j.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); | 280 | for( i = j.first(); i; i = j.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); |
281 | } | 281 | } |
diff --git a/libkcal/calendar.h b/libkcal/calendar.h index d5294eb..b801186 100644 --- a/libkcal/calendar.h +++ b/libkcal/calendar.h | |||
@@ -54,33 +54,33 @@ namespace KCal { | |||
54 | Calendar by addEvent() it is owned by the Calendar object. The Calendar takes | 54 | Calendar by addEvent() it is owned by the Calendar object. The Calendar takes |
55 | care of deleting it. All Events returned by the query functions are returned | 55 | care of deleting it. All Events returned by the query functions are returned |
56 | as pointers, that means all changes to the returned events are immediately | 56 | as pointers, that means all changes to the returned events are immediately |
57 | visible in the Calendar. You shouldn't delete any Event object you get from | 57 | visible in the Calendar. You shouldn't delete any Event object you get from |
58 | Calendar. | 58 | Calendar. |
59 | */ | 59 | */ |
60 | class Calendar : public QObject, public CustomProperties, | 60 | class Calendar : public QObject, public CustomProperties, |
61 | public IncidenceBase::Observer | 61 | public IncidenceBase::Observer |
62 | { | 62 | { |
63 | Q_OBJECT | 63 | Q_OBJECT |
64 | public: | 64 | public: |
65 | Calendar(); | 65 | Calendar(); |
66 | Calendar(const QString &timeZoneId); | 66 | Calendar(const QString &timeZoneId); |
67 | virtual ~Calendar(); | 67 | virtual ~Calendar(); |
68 | void deleteIncidence(Incidence *in); | 68 | void deleteIncidence(Incidence *in); |
69 | void resetTempSyncStat(); | 69 | void resetTempSyncStat(); |
70 | void resetPilotStat(); | 70 | void resetPilotStat(int id); |
71 | /** | 71 | /** |
72 | Clears out the current calendar, freeing all used memory etc. | 72 | Clears out the current calendar, freeing all used memory etc. |
73 | */ | 73 | */ |
74 | virtual void close() = 0; | 74 | virtual void close() = 0; |
75 | 75 | ||
76 | /** | 76 | /** |
77 | Sync changes in memory to persistant storage. | 77 | Sync changes in memory to persistant storage. |
78 | */ | 78 | */ |
79 | virtual void save() = 0; | 79 | virtual void save() = 0; |
80 | virtual QPtrList<Event> getExternLastSyncEvents() = 0; | 80 | virtual QPtrList<Event> getExternLastSyncEvents() = 0; |
81 | virtual bool isSaving() { return false; } | 81 | virtual bool isSaving() { return false; } |
82 | 82 | ||
83 | /** | 83 | /** |
84 | Return the owner of the calendar's full name. | 84 | Return the owner of the calendar's full name. |
85 | */ | 85 | */ |
86 | const QString &getOwner() const; | 86 | const QString &getOwner() const; |