author | zautrix <zautrix> | 2005-07-29 20:08:52 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-29 20:08:52 (UTC) |
commit | e287df45507793e2e5ad16085a858153f3798941 (patch) (unidiff) | |
tree | f91ff66a8ac59254b9a0158e55d6254ca2928d75 /libkcal | |
parent | 48a8fa71f1985fea9df4981808796ef65f0f974a (diff) | |
download | kdepimpi-e287df45507793e2e5ad16085a858153f3798941.zip kdepimpi-e287df45507793e2e5ad16085a858153f3798941.tar.gz kdepimpi-e287df45507793e2e5ad16085a858153f3798941.tar.bz2 |
fixx
-rw-r--r-- | libkcal/calendarlocal.cpp | 2 | ||||
-rw-r--r-- | libkcal/icalformatimpl.cpp | 11 | ||||
-rw-r--r-- | libkcal/journal.cpp | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index eef8327..5baa7dc 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp | |||
@@ -163,193 +163,193 @@ bool CalendarLocal::mergeCalendar( Calendar* remote ) | |||
163 | } | 163 | } |
164 | 164 | ||
165 | 165 | ||
166 | bool CalendarLocal::addCalendarFile( QString name, int id ) | 166 | bool CalendarLocal::addCalendarFile( QString name, int id ) |
167 | { | 167 | { |
168 | CalendarLocal calendar( timeZoneId() ); | 168 | CalendarLocal calendar( timeZoneId() ); |
169 | calendar.setDefaultCalendar( id ); | 169 | calendar.setDefaultCalendar( id ); |
170 | if ( calendar.load( name ) ) { | 170 | if ( calendar.load( name ) ) { |
171 | addCalendar( &calendar ); | 171 | addCalendar( &calendar ); |
172 | return true; | 172 | return true; |
173 | } | 173 | } |
174 | return false; | 174 | return false; |
175 | } | 175 | } |
176 | void CalendarLocal::setSyncEventsReadOnly() | 176 | void CalendarLocal::setSyncEventsReadOnly() |
177 | { | 177 | { |
178 | Event * ev; | 178 | Event * ev; |
179 | ev = mEventList.first(); | 179 | ev = mEventList.first(); |
180 | while ( ev ) { | 180 | while ( ev ) { |
181 | if ( ev->uid().left(15) == QString("last-syncEvent-") ) | 181 | if ( ev->uid().left(15) == QString("last-syncEvent-") ) |
182 | ev->setReadOnly( true ); | 182 | ev->setReadOnly( true ); |
183 | ev = mEventList.next(); | 183 | ev = mEventList.next(); |
184 | } | 184 | } |
185 | } | 185 | } |
186 | void CalendarLocal::addCalendar( Calendar* cal ) | 186 | void CalendarLocal::addCalendar( Calendar* cal ) |
187 | { | 187 | { |
188 | cal->setDontDeleteIncidencesOnClose(); | 188 | cal->setDontDeleteIncidencesOnClose(); |
189 | { | 189 | { |
190 | QPtrList<Event> EventList = cal->rawEvents(); | 190 | QPtrList<Event> EventList = cal->rawEvents(); |
191 | Event * ev = EventList.first(); | 191 | Event * ev = EventList.first(); |
192 | while ( ev ) { | 192 | while ( ev ) { |
193 | ev->unRegisterObserver( cal ); | 193 | ev->unRegisterObserver( cal ); |
194 | ev->registerObserver( this ); | 194 | ev->registerObserver( this ); |
195 | mEventList.append( ev ); | 195 | mEventList.append( ev ); |
196 | ev = EventList.next(); | 196 | ev = EventList.next(); |
197 | } | 197 | } |
198 | } | 198 | } |
199 | { | 199 | { |
200 | 200 | ||
201 | QPtrList<Todo> TodoList = cal->rawTodos(); | 201 | QPtrList<Todo> TodoList = cal->rawTodos(); |
202 | Todo * ev = TodoList.first(); | 202 | Todo * ev = TodoList.first(); |
203 | while ( ev ) { | 203 | while ( ev ) { |
204 | QString rel = ev->relatedToUid(); | 204 | QString rel = ev->relatedToUid(); |
205 | if ( !rel.isEmpty() ){ | 205 | if ( !rel.isEmpty() ){ |
206 | ev->setRelatedTo ( 0 ); | 206 | ev->setRelatedTo ( 0 ); |
207 | ev->setRelatedToUid( rel ); | 207 | ev->setRelatedToUid( rel ); |
208 | } | 208 | } |
209 | ev = TodoList.next(); | 209 | ev = TodoList.next(); |
210 | } | 210 | } |
211 | //TodoList = cal->rawTodos(); | 211 | //TodoList = cal->rawTodos(); |
212 | ev = TodoList.first(); | 212 | ev = TodoList.first(); |
213 | while ( ev ) { | 213 | while ( ev ) { |
214 | ev->unRegisterObserver( cal ); | 214 | ev->unRegisterObserver( cal ); |
215 | ev->registerObserver( this ); | 215 | ev->registerObserver( this ); |
216 | mTodoList.append( ev ); | 216 | mTodoList.append( ev ); |
217 | setupRelations( ev ); | 217 | setupRelations( ev ); |
218 | ev = TodoList.next(); | 218 | ev = TodoList.next(); |
219 | } | 219 | } |
220 | } | 220 | } |
221 | { | 221 | { |
222 | QPtrList<Journal> JournalList = cal->journals(); | 222 | QPtrList<Journal> JournalList = cal->journals(); |
223 | Journal * ev = JournalList.first(); | 223 | Journal * ev = JournalList.first(); |
224 | while ( ev ) { | 224 | while ( ev ) { |
225 | ev->unRegisterObserver( cal ); | 225 | ev->unRegisterObserver( cal ); |
226 | ev->registerObserver( this ); | 226 | ev->registerObserver( this ); |
227 | mJournalList.append( ev ); | 227 | mJournalList.append( ev ); |
228 | ev = JournalList.next(); | 228 | ev = JournalList.next(); |
229 | } | 229 | } |
230 | } | 230 | } |
231 | setModified( true ); | 231 | setModified( true ); |
232 | } | 232 | } |
233 | bool CalendarLocal::load( const QString &fileName ) | 233 | bool CalendarLocal::load( const QString &fileName ) |
234 | { | 234 | { |
235 | FileStorage storage( this, fileName ); | 235 | FileStorage storage( this, fileName ); |
236 | return storage.load(); | 236 | return storage.load(); |
237 | } | 237 | } |
238 | 238 | ||
239 | bool CalendarLocal::save( const QString &fileName, CalFormat *format ) | 239 | bool CalendarLocal::save( const QString &fileName, CalFormat *format ) |
240 | { | 240 | { |
241 | FileStorage storage( this, fileName, format ); | 241 | FileStorage storage( this, fileName, format ); |
242 | return storage.save(); | 242 | return storage.save(); |
243 | } | 243 | } |
244 | 244 | ||
245 | void CalendarLocal::stopAllTodos() | 245 | void CalendarLocal::stopAllTodos() |
246 | { | 246 | { |
247 | for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() ) | 247 | for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() ) |
248 | it->setRunning( false ); | 248 | it->setRunning( false ); |
249 | 249 | ||
250 | } | 250 | } |
251 | void CalendarLocal::close() | 251 | void CalendarLocal::close() |
252 | { | 252 | { |
253 | 253 | ||
254 | Todo * i; | 254 | Todo * i; |
255 | for( i = mTodoList.first(); i; i = mTodoList.next() ) i->setRunning(false); | 255 | for( i = mTodoList.first(); i; i = mTodoList.next() ) i->setRunning(false); |
256 | 256 | ||
257 | mEventList.setAutoDelete( true ); | 257 | mEventList.setAutoDelete( true ); |
258 | mTodoList.setAutoDelete( true ); | 258 | mTodoList.setAutoDelete( true ); |
259 | mJournalList.setAutoDelete( false ); | 259 | mJournalList.setAutoDelete( true ); |
260 | 260 | ||
261 | mEventList.clear(); | 261 | mEventList.clear(); |
262 | mTodoList.clear(); | 262 | mTodoList.clear(); |
263 | mJournalList.clear(); | 263 | mJournalList.clear(); |
264 | 264 | ||
265 | mEventList.setAutoDelete( false ); | 265 | mEventList.setAutoDelete( false ); |
266 | mTodoList.setAutoDelete( false ); | 266 | mTodoList.setAutoDelete( false ); |
267 | mJournalList.setAutoDelete( false ); | 267 | mJournalList.setAutoDelete( false ); |
268 | 268 | ||
269 | setModified( false ); | 269 | setModified( false ); |
270 | } | 270 | } |
271 | 271 | ||
272 | bool CalendarLocal::addAnniversaryNoDup( Event *event ) | 272 | bool CalendarLocal::addAnniversaryNoDup( Event *event ) |
273 | { | 273 | { |
274 | QString cat; | 274 | QString cat; |
275 | bool isBirthday = true; | 275 | bool isBirthday = true; |
276 | if( event->categoriesStr() == i18n( "Anniversary" ) ) { | 276 | if( event->categoriesStr() == i18n( "Anniversary" ) ) { |
277 | isBirthday = false; | 277 | isBirthday = false; |
278 | cat = i18n( "Anniversary" ); | 278 | cat = i18n( "Anniversary" ); |
279 | } else if( event->categoriesStr() == i18n( "Birthday" ) ) { | 279 | } else if( event->categoriesStr() == i18n( "Birthday" ) ) { |
280 | isBirthday = true; | 280 | isBirthday = true; |
281 | cat = i18n( "Birthday" ); | 281 | cat = i18n( "Birthday" ); |
282 | } else { | 282 | } else { |
283 | qDebug("addAnniversaryNoDup called without fitting category! "); | 283 | qDebug("addAnniversaryNoDup called without fitting category! "); |
284 | return false; | 284 | return false; |
285 | } | 285 | } |
286 | Event * eve; | 286 | Event * eve; |
287 | for ( eve = mEventList.first(); eve ; eve = mEventList.next() ) { | 287 | for ( eve = mEventList.first(); eve ; eve = mEventList.next() ) { |
288 | if ( !(eve->categories().contains( cat ) )) | 288 | if ( !(eve->categories().contains( cat ) )) |
289 | continue; | 289 | continue; |
290 | // now we have an event with fitting category | 290 | // now we have an event with fitting category |
291 | if ( eve->dtStart().date() != event->dtStart().date() ) | 291 | if ( eve->dtStart().date() != event->dtStart().date() ) |
292 | continue; | 292 | continue; |
293 | // now we have an event with fitting category+date | 293 | // now we have an event with fitting category+date |
294 | if ( eve->summary() != event->summary() ) | 294 | if ( eve->summary() != event->summary() ) |
295 | continue; | 295 | continue; |
296 | // now we have an event with fitting category+date+summary | 296 | // now we have an event with fitting category+date+summary |
297 | return false; | 297 | return false; |
298 | } | 298 | } |
299 | return addEvent( event ); | 299 | return addEvent( event ); |
300 | 300 | ||
301 | } | 301 | } |
302 | bool CalendarLocal::addEventNoDup( Event *event ) | 302 | bool CalendarLocal::addEventNoDup( Event *event ) |
303 | { | 303 | { |
304 | Event * eve; | 304 | Event * eve; |
305 | for ( eve = mEventList.first(); eve ; eve = mEventList.next() ) { | 305 | for ( eve = mEventList.first(); eve ; eve = mEventList.next() ) { |
306 | if ( *eve == *event ) { | 306 | if ( *eve == *event ) { |
307 | //qDebug("CalendarLocal::Duplicate event found! Not inserted! "); | 307 | //qDebug("CalendarLocal::Duplicate event found! Not inserted! "); |
308 | return false; | 308 | return false; |
309 | } | 309 | } |
310 | } | 310 | } |
311 | return addEvent( event ); | 311 | return addEvent( event ); |
312 | } | 312 | } |
313 | 313 | ||
314 | bool CalendarLocal::addEvent( Event *event ) | 314 | bool CalendarLocal::addEvent( Event *event ) |
315 | { | 315 | { |
316 | insertEvent( event ); | 316 | insertEvent( event ); |
317 | 317 | ||
318 | event->registerObserver( this ); | 318 | event->registerObserver( this ); |
319 | 319 | ||
320 | setModified( true ); | 320 | setModified( true ); |
321 | if ( event->calID() == 0 ) | 321 | if ( event->calID() == 0 ) |
322 | event->setCalID( mDefaultCalendar ); | 322 | event->setCalID( mDefaultCalendar ); |
323 | event->setCalEnabled( true ); | 323 | event->setCalEnabled( true ); |
324 | 324 | ||
325 | return true; | 325 | return true; |
326 | } | 326 | } |
327 | 327 | ||
328 | void CalendarLocal::deleteEvent( Event *event ) | 328 | void CalendarLocal::deleteEvent( Event *event ) |
329 | { | 329 | { |
330 | if ( mUndoIncidence ) delete mUndoIncidence; | 330 | if ( mUndoIncidence ) delete mUndoIncidence; |
331 | mUndoIncidence = event->clone(); | 331 | mUndoIncidence = event->clone(); |
332 | if ( mEventList.removeRef( event ) ) { | 332 | if ( mEventList.removeRef( event ) ) { |
333 | setModified( true ); | 333 | setModified( true ); |
334 | } | 334 | } |
335 | } | 335 | } |
336 | 336 | ||
337 | 337 | ||
338 | Event *CalendarLocal::event( const QString &uid ) | 338 | Event *CalendarLocal::event( const QString &uid ) |
339 | { | 339 | { |
340 | Event *event; | 340 | Event *event; |
341 | Event *retVal = 0; | 341 | Event *retVal = 0; |
342 | for ( event = mEventList.first(); event; event = mEventList.next() ) { | 342 | for ( event = mEventList.first(); event; event = mEventList.next() ) { |
343 | if ( event->calEnabled() && event->uid() == uid ) { | 343 | if ( event->calEnabled() && event->uid() == uid ) { |
344 | if ( retVal ) { | 344 | if ( retVal ) { |
345 | if ( retVal->calID() > event->calID() ) { | 345 | if ( retVal->calID() > event->calID() ) { |
346 | retVal = event; | 346 | retVal = event; |
347 | } | 347 | } |
348 | } else { | 348 | } else { |
349 | retVal = event; | 349 | retVal = event; |
350 | } | 350 | } |
351 | } | 351 | } |
352 | } | 352 | } |
353 | return retVal; | 353 | return retVal; |
354 | } | 354 | } |
355 | bool CalendarLocal::addTodoNoDup( Todo *todo ) | 355 | bool CalendarLocal::addTodoNoDup( Todo *todo ) |
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp index f349681..53aa039 100644 --- a/libkcal/icalformatimpl.cpp +++ b/libkcal/icalformatimpl.cpp | |||
@@ -909,193 +909,193 @@ Event *ICalFormatImpl::readEvent(icalcomponent *vevent) | |||
909 | } | 909 | } |
910 | anEvent->setAttachments(tmpStrList); | 910 | anEvent->setAttachments(tmpStrList); |
911 | 911 | ||
912 | // resources | 912 | // resources |
913 | if ((vo = isAPropertyOf(vevent, VCResourcesProp)) != 0) { | 913 | if ((vo = isAPropertyOf(vevent, VCResourcesProp)) != 0) { |
914 | QString resources = (s = fakeCString(vObjectUStringZValue(vo))); | 914 | QString resources = (s = fakeCString(vObjectUStringZValue(vo))); |
915 | deleteStr(s); | 915 | deleteStr(s); |
916 | tmpStrList.clear(); | 916 | tmpStrList.clear(); |
917 | index1 = 0; | 917 | index1 = 0; |
918 | index2 = 0; | 918 | index2 = 0; |
919 | QString resource; | 919 | QString resource; |
920 | while ((index2 = resources.find(';', index1)) != -1) { | 920 | while ((index2 = resources.find(';', index1)) != -1) { |
921 | resource = resources.mid(index1, (index2 - index1)); | 921 | resource = resources.mid(index1, (index2 - index1)); |
922 | tmpStrList.append(resource); | 922 | tmpStrList.append(resource); |
923 | index1 = index2; | 923 | index1 = index2; |
924 | } | 924 | } |
925 | anEvent->setResources(tmpStrList); | 925 | anEvent->setResources(tmpStrList); |
926 | } | 926 | } |
927 | #endif | 927 | #endif |
928 | 928 | ||
929 | case ICAL_RELATEDTO_PROPERTY: // releated event (parent) | 929 | case ICAL_RELATEDTO_PROPERTY: // releated event (parent) |
930 | event->setRelatedToUid(QString::fromUtf8(icalproperty_get_relatedto(p))); | 930 | event->setRelatedToUid(QString::fromUtf8(icalproperty_get_relatedto(p))); |
931 | mEventsRelate.append(event); | 931 | mEventsRelate.append(event); |
932 | break; | 932 | break; |
933 | 933 | ||
934 | case ICAL_TRANSP_PROPERTY: // Transparency | 934 | case ICAL_TRANSP_PROPERTY: // Transparency |
935 | if(icalproperty_get_transp(p) == ICAL_TRANSP_TRANSPARENT ) | 935 | if(icalproperty_get_transp(p) == ICAL_TRANSP_TRANSPARENT ) |
936 | event->setTransparency( Event::Transparent ); | 936 | event->setTransparency( Event::Transparent ); |
937 | else | 937 | else |
938 | event->setTransparency( Event::Opaque ); | 938 | event->setTransparency( Event::Opaque ); |
939 | break; | 939 | break; |
940 | 940 | ||
941 | default: | 941 | default: |
942 | // kdDebug(5800) << "ICALFormat::readEvent(): Unknown property: " << kind | 942 | // kdDebug(5800) << "ICALFormat::readEvent(): Unknown property: " << kind |
943 | // << endl; | 943 | // << endl; |
944 | break; | 944 | break; |
945 | } | 945 | } |
946 | 946 | ||
947 | p = icalcomponent_get_next_property(vevent,ICAL_ANY_PROPERTY); | 947 | p = icalcomponent_get_next_property(vevent,ICAL_ANY_PROPERTY); |
948 | } | 948 | } |
949 | 949 | ||
950 | QString msade = event->nonKDECustomProperty("X-MICROSOFT-CDO-ALLDAYEVENT"); | 950 | QString msade = event->nonKDECustomProperty("X-MICROSOFT-CDO-ALLDAYEVENT"); |
951 | if (!msade.isNull()) { | 951 | if (!msade.isNull()) { |
952 | bool floats = (msade == QString::fromLatin1("TRUE")); | 952 | bool floats = (msade == QString::fromLatin1("TRUE")); |
953 | kdDebug(5800) << "ICALFormat::readEvent(): all day event: " << floats << endl; | 953 | kdDebug(5800) << "ICALFormat::readEvent(): all day event: " << floats << endl; |
954 | event->setFloats(floats); | 954 | event->setFloats(floats); |
955 | if (floats) { | 955 | if (floats) { |
956 | QDateTime endDate = event->dtEnd(); | 956 | QDateTime endDate = event->dtEnd(); |
957 | event->setDtEnd(endDate.addDays(-1)); | 957 | event->setDtEnd(endDate.addDays(-1)); |
958 | } | 958 | } |
959 | } | 959 | } |
960 | 960 | ||
961 | // some stupid vCal exporters ignore the standard and use Description | 961 | // some stupid vCal exporters ignore the standard and use Description |
962 | // instead of Summary for the default field. Correct for this. | 962 | // instead of Summary for the default field. Correct for this. |
963 | if (event->summary().isEmpty() && | 963 | if (event->summary().isEmpty() && |
964 | !(event->description().isEmpty())) { | 964 | !(event->description().isEmpty())) { |
965 | QString tmpStr = event->description().simplifyWhiteSpace(); | 965 | QString tmpStr = event->description().simplifyWhiteSpace(); |
966 | event->setDescription(""); | 966 | event->setDescription(""); |
967 | event->setSummary(tmpStr); | 967 | event->setSummary(tmpStr); |
968 | } | 968 | } |
969 | 969 | ||
970 | return event; | 970 | return event; |
971 | } | 971 | } |
972 | 972 | ||
973 | FreeBusy *ICalFormatImpl::readFreeBusy(icalcomponent *vfreebusy) | 973 | FreeBusy *ICalFormatImpl::readFreeBusy(icalcomponent *vfreebusy) |
974 | { | 974 | { |
975 | FreeBusy *freebusy = new FreeBusy; | 975 | FreeBusy *freebusy = new FreeBusy; |
976 | 976 | ||
977 | readIncidenceBase(vfreebusy,freebusy); | 977 | readIncidenceBase(vfreebusy,freebusy); |
978 | 978 | ||
979 | icalproperty *p = icalcomponent_get_first_property(vfreebusy,ICAL_ANY_PROPERTY); | 979 | icalproperty *p = icalcomponent_get_first_property(vfreebusy,ICAL_ANY_PROPERTY); |
980 | 980 | ||
981 | icaltimetype icaltime; | 981 | icaltimetype icaltime; |
982 | icalperiodtype icalperiod; | 982 | icalperiodtype icalperiod; |
983 | QDateTime period_start, period_end; | 983 | QDateTime period_start, period_end; |
984 | 984 | ||
985 | while (p) { | 985 | while (p) { |
986 | icalproperty_kind kind = icalproperty_isa(p); | 986 | icalproperty_kind kind = icalproperty_isa(p); |
987 | switch (kind) { | 987 | switch (kind) { |
988 | 988 | ||
989 | case ICAL_DTSTART_PROPERTY: // start date and time | 989 | case ICAL_DTSTART_PROPERTY: // start date and time |
990 | icaltime = icalproperty_get_dtstart(p); | 990 | icaltime = icalproperty_get_dtstart(p); |
991 | freebusy->setDtStart(readICalDateTime(icaltime)); | 991 | freebusy->setDtStart(readICalDateTime(icaltime)); |
992 | break; | 992 | break; |
993 | 993 | ||
994 | case ICAL_DTEND_PROPERTY: // start End Date and Time | 994 | case ICAL_DTEND_PROPERTY: // start End Date and Time |
995 | icaltime = icalproperty_get_dtend(p); | 995 | icaltime = icalproperty_get_dtend(p); |
996 | freebusy->setDtEnd(readICalDateTime(icaltime)); | 996 | freebusy->setDtEnd(readICalDateTime(icaltime)); |
997 | break; | 997 | break; |
998 | 998 | ||
999 | case ICAL_FREEBUSY_PROPERTY: //Any FreeBusy Times | 999 | case ICAL_FREEBUSY_PROPERTY: //Any FreeBusy Times |
1000 | icalperiod = icalproperty_get_freebusy(p); | 1000 | icalperiod = icalproperty_get_freebusy(p); |
1001 | period_start = readICalDateTime(icalperiod.start); | 1001 | period_start = readICalDateTime(icalperiod.start); |
1002 | period_end = readICalDateTime(icalperiod.end); | 1002 | period_end = readICalDateTime(icalperiod.end); |
1003 | freebusy->addPeriod(period_start, period_end); | 1003 | freebusy->addPeriod(period_start, period_end); |
1004 | break; | 1004 | break; |
1005 | 1005 | ||
1006 | default: | 1006 | default: |
1007 | kdDebug(5800) << "ICALFormat::readIncidence(): Unknown property: " << kind | 1007 | kdDebug(5800) << "ICALFormat::readIncidence(): Unknown property: " << kind |
1008 | << endl; | 1008 | << endl; |
1009 | break; | 1009 | break; |
1010 | } | 1010 | } |
1011 | p = icalcomponent_get_next_property(vfreebusy,ICAL_ANY_PROPERTY); | 1011 | p = icalcomponent_get_next_property(vfreebusy,ICAL_ANY_PROPERTY); |
1012 | } | 1012 | } |
1013 | 1013 | ||
1014 | return freebusy; | 1014 | return freebusy; |
1015 | } | 1015 | } |
1016 | 1016 | ||
1017 | Journal *ICalFormatImpl::readJournal(icalcomponent *vjournal) | 1017 | Journal *ICalFormatImpl::readJournal(icalcomponent *vjournal) |
1018 | { | 1018 | { |
1019 | Journal *journal = new Journal; | 1019 | Journal *journal = new Journal; |
1020 | 1020 | ||
1021 | readIncidence(vjournal,journal); | 1021 | readIncidence(vjournal,journal); |
1022 | 1022 | ||
1023 | if ( !journal->dtStart().isValid() && journal->created().isValid() ) { | 1023 | if ( !journal->dtStart().isValid() && journal->created().isValid() ) { |
1024 | journal->setDtStart( journal->created() ); | 1024 | journal->setDtStart( journal->created() ); |
1025 | } | 1025 | } |
1026 | return journal; | 1026 | return journal; |
1027 | } | 1027 | } |
1028 | 1028 | ||
1029 | Attendee *ICalFormatImpl::readAttendee(icalproperty *attendee) | 1029 | Attendee *ICalFormatImpl::readAttendee(icalproperty *attendee) |
1030 | { | 1030 | { |
1031 | icalparameter *p = 0; | 1031 | icalparameter *p = 0; |
1032 | 1032 | ||
1033 | QString email = QString::fromUtf8(icalproperty_get_attendee(attendee)); | 1033 | QString email = QString::fromUtf8(icalproperty_get_attendee(attendee)); |
1034 | 1034 | ||
1035 | QString name; | 1035 | QString name; |
1036 | QString uid = QString::null; | 1036 | QString uid = QString::null; |
1037 | p = icalproperty_get_first_parameter(attendee,ICAL_CN_PARAMETER); | 1037 | p = icalproperty_get_first_parameter(attendee,ICAL_CN_PARAMETER); |
1038 | if (p) { | 1038 | if (p) { |
1039 | name = QString::fromUtf8(icalparameter_get_cn(p)); | 1039 | name = QString::fromUtf8(icalparameter_get_cn(p)); |
1040 | } else { | 1040 | } else { |
1041 | } | 1041 | } |
1042 | 1042 | ||
1043 | bool rsvp=false; | 1043 | bool rsvp=false; |
1044 | p = icalproperty_get_first_parameter(attendee,ICAL_RSVP_PARAMETER); | 1044 | p = icalproperty_get_first_parameter(attendee,ICAL_RSVP_PARAMETER); |
1045 | if (p) { | 1045 | if (p) { |
1046 | icalparameter_rsvp rsvpParameter = icalparameter_get_rsvp(p); | 1046 | icalparameter_rsvp rsvpParameter = icalparameter_get_rsvp(p); |
1047 | if (rsvpParameter == ICAL_RSVP_TRUE) rsvp = true; | 1047 | if (rsvpParameter == ICAL_RSVP_TRUE) rsvp = true; |
1048 | } | 1048 | } |
1049 | 1049 | ||
1050 | Attendee::PartStat status = Attendee::NeedsAction; | 1050 | Attendee::PartStat status = Attendee::NeedsAction; |
1051 | p = icalproperty_get_first_parameter(attendee,ICAL_PARTSTAT_PARAMETER); | 1051 | p = icalproperty_get_first_parameter(attendee,ICAL_PARTSTAT_PARAMETER); |
1052 | if (p) { | 1052 | if (p) { |
1053 | icalparameter_partstat partStatParameter = icalparameter_get_partstat(p); | 1053 | icalparameter_partstat partStatParameter = icalparameter_get_partstat(p); |
1054 | switch(partStatParameter) { | 1054 | switch(partStatParameter) { |
1055 | default: | 1055 | default: |
1056 | case ICAL_PARTSTAT_NEEDSACTION: | 1056 | case ICAL_PARTSTAT_NEEDSACTION: |
1057 | status = Attendee::NeedsAction; | 1057 | status = Attendee::NeedsAction; |
1058 | break; | 1058 | break; |
1059 | case ICAL_PARTSTAT_ACCEPTED: | 1059 | case ICAL_PARTSTAT_ACCEPTED: |
1060 | status = Attendee::Accepted; | 1060 | status = Attendee::Accepted; |
1061 | break; | 1061 | break; |
1062 | case ICAL_PARTSTAT_DECLINED: | 1062 | case ICAL_PARTSTAT_DECLINED: |
1063 | status = Attendee::Declined; | 1063 | status = Attendee::Declined; |
1064 | break; | 1064 | break; |
1065 | case ICAL_PARTSTAT_TENTATIVE: | 1065 | case ICAL_PARTSTAT_TENTATIVE: |
1066 | status = Attendee::Tentative; | 1066 | status = Attendee::Tentative; |
1067 | break; | 1067 | break; |
1068 | case ICAL_PARTSTAT_DELEGATED: | 1068 | case ICAL_PARTSTAT_DELEGATED: |
1069 | status = Attendee::Delegated; | 1069 | status = Attendee::Delegated; |
1070 | break; | 1070 | break; |
1071 | case ICAL_PARTSTAT_COMPLETED: | 1071 | case ICAL_PARTSTAT_COMPLETED: |
1072 | status = Attendee::Completed; | 1072 | status = Attendee::Completed; |
1073 | break; | 1073 | break; |
1074 | case ICAL_PARTSTAT_INPROCESS: | 1074 | case ICAL_PARTSTAT_INPROCESS: |
1075 | status = Attendee::InProcess; | 1075 | status = Attendee::InProcess; |
1076 | break; | 1076 | break; |
1077 | } | 1077 | } |
1078 | } | 1078 | } |
1079 | 1079 | ||
1080 | Attendee::Role role = Attendee::ReqParticipant; | 1080 | Attendee::Role role = Attendee::ReqParticipant; |
1081 | p = icalproperty_get_first_parameter(attendee,ICAL_ROLE_PARAMETER); | 1081 | p = icalproperty_get_first_parameter(attendee,ICAL_ROLE_PARAMETER); |
1082 | if (p) { | 1082 | if (p) { |
1083 | icalparameter_role roleParameter = icalparameter_get_role(p); | 1083 | icalparameter_role roleParameter = icalparameter_get_role(p); |
1084 | switch(roleParameter) { | 1084 | switch(roleParameter) { |
1085 | case ICAL_ROLE_CHAIR: | 1085 | case ICAL_ROLE_CHAIR: |
1086 | role = Attendee::Chair; | 1086 | role = Attendee::Chair; |
1087 | break; | 1087 | break; |
1088 | default: | 1088 | default: |
1089 | case ICAL_ROLE_REQPARTICIPANT: | 1089 | case ICAL_ROLE_REQPARTICIPANT: |
1090 | role = Attendee::ReqParticipant; | 1090 | role = Attendee::ReqParticipant; |
1091 | break; | 1091 | break; |
1092 | case ICAL_ROLE_OPTPARTICIPANT: | 1092 | case ICAL_ROLE_OPTPARTICIPANT: |
1093 | role = Attendee::OptParticipant; | 1093 | role = Attendee::OptParticipant; |
1094 | break; | 1094 | break; |
1095 | case ICAL_ROLE_NONPARTICIPANT: | 1095 | case ICAL_ROLE_NONPARTICIPANT: |
1096 | role = Attendee::NonParticipant; | 1096 | role = Attendee::NonParticipant; |
1097 | break; | 1097 | break; |
1098 | } | 1098 | } |
1099 | } | 1099 | } |
1100 | 1100 | ||
1101 | p = icalproperty_get_first_parameter(attendee,ICAL_X_PARAMETER); | 1101 | p = icalproperty_get_first_parameter(attendee,ICAL_X_PARAMETER); |
@@ -1851,211 +1851,214 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar) | |||
1851 | i18n("This calendar is an iTIP transaction of type \"%1\".") | 1851 | i18n("This calendar is an iTIP transaction of type \"%1\".") |
1852 | .arg(methodType), | 1852 | .arg(methodType), |
1853 | i18n("%1: iTIP Transaction").arg(CalFormat::application())); | 1853 | i18n("%1: iTIP Transaction").arg(CalFormat::application())); |
1854 | delete methodType; | 1854 | delete methodType; |
1855 | } | 1855 | } |
1856 | #endif | 1856 | #endif |
1857 | 1857 | ||
1858 | icalproperty *p; | 1858 | icalproperty *p; |
1859 | 1859 | ||
1860 | p = icalcomponent_get_first_property(calendar,ICAL_PRODID_PROPERTY); | 1860 | p = icalcomponent_get_first_property(calendar,ICAL_PRODID_PROPERTY); |
1861 | if (!p) { | 1861 | if (!p) { |
1862 | // TODO: does no PRODID really matter? | 1862 | // TODO: does no PRODID really matter? |
1863 | // mParent->setException(new ErrorFormat(ErrorFormat::CalVersionUnknown)); | 1863 | // mParent->setException(new ErrorFormat(ErrorFormat::CalVersionUnknown)); |
1864 | // return false; | 1864 | // return false; |
1865 | mLoadedProductId = ""; | 1865 | mLoadedProductId = ""; |
1866 | mCalendarVersion = 0; | 1866 | mCalendarVersion = 0; |
1867 | } else { | 1867 | } else { |
1868 | mLoadedProductId = QString::fromUtf8(icalproperty_get_prodid(p)); | 1868 | mLoadedProductId = QString::fromUtf8(icalproperty_get_prodid(p)); |
1869 | mCalendarVersion = CalFormat::calendarVersion(mLoadedProductId); | 1869 | mCalendarVersion = CalFormat::calendarVersion(mLoadedProductId); |
1870 | 1870 | ||
1871 | delete mCompat; | 1871 | delete mCompat; |
1872 | mCompat = CompatFactory::createCompat( mLoadedProductId ); | 1872 | mCompat = CompatFactory::createCompat( mLoadedProductId ); |
1873 | } | 1873 | } |
1874 | 1874 | ||
1875 | // TODO: check for unknown PRODID | 1875 | // TODO: check for unknown PRODID |
1876 | #if 0 | 1876 | #if 0 |
1877 | if (!mCalendarVersion | 1877 | if (!mCalendarVersion |
1878 | && CalFormat::productId() != mLoadedProductId) { | 1878 | && CalFormat::productId() != mLoadedProductId) { |
1879 | // warn the user that we might have trouble reading non-known calendar. | 1879 | // warn the user that we might have trouble reading non-known calendar. |
1880 | if (mEnableDialogs) | 1880 | if (mEnableDialogs) |
1881 | KMessageBox::information(mTopWidget, | 1881 | KMessageBox::information(mTopWidget, |
1882 | i18n("This vCalendar file was not created by KOrganizer " | 1882 | i18n("This vCalendar file was not created by KOrganizer " |
1883 | "or any other product we support. Loading anyway..."), | 1883 | "or any other product we support. Loading anyway..."), |
1884 | i18n("%1: Unknown vCalendar Vendor").arg(CalFormat::application())); | 1884 | i18n("%1: Unknown vCalendar Vendor").arg(CalFormat::application())); |
1885 | } | 1885 | } |
1886 | #endif | 1886 | #endif |
1887 | 1887 | ||
1888 | p = icalcomponent_get_first_property(calendar,ICAL_VERSION_PROPERTY); | 1888 | p = icalcomponent_get_first_property(calendar,ICAL_VERSION_PROPERTY); |
1889 | if (!p) { | 1889 | if (!p) { |
1890 | mParent->setException(new ErrorFormat(ErrorFormat::CalVersionUnknown)); | 1890 | mParent->setException(new ErrorFormat(ErrorFormat::CalVersionUnknown)); |
1891 | return false; | 1891 | return false; |
1892 | } else { | 1892 | } else { |
1893 | const char *version = icalproperty_get_version(p); | 1893 | const char *version = icalproperty_get_version(p); |
1894 | 1894 | ||
1895 | if (strcmp(version,"1.0") == 0) { | 1895 | if (strcmp(version,"1.0") == 0) { |
1896 | mParent->setException(new ErrorFormat(ErrorFormat::CalVersion1, | 1896 | mParent->setException(new ErrorFormat(ErrorFormat::CalVersion1, |
1897 | i18n("Expected iCalendar format"))); | 1897 | i18n("Expected iCalendar format"))); |
1898 | return false; | 1898 | return false; |
1899 | } else if (strcmp(version,"2.0") != 0) { | 1899 | } else if (strcmp(version,"2.0") != 0) { |
1900 | mParent->setException(new ErrorFormat(ErrorFormat::CalVersionUnknown)); | 1900 | mParent->setException(new ErrorFormat(ErrorFormat::CalVersionUnknown)); |
1901 | return false; | 1901 | return false; |
1902 | } | 1902 | } |
1903 | } | 1903 | } |
1904 | 1904 | ||
1905 | 1905 | ||
1906 | // TODO: check for calendar format version | 1906 | // TODO: check for calendar format version |
1907 | #if 0 | 1907 | #if 0 |
1908 | // warn the user we might have trouble reading this unknown version. | 1908 | // warn the user we might have trouble reading this unknown version. |
1909 | if ((curVO = isAPropertyOf(vcal, VCVersionProp)) != 0) { | 1909 | if ((curVO = isAPropertyOf(vcal, VCVersionProp)) != 0) { |
1910 | char *s = fakeCString(vObjectUStringZValue(curVO)); | 1910 | char *s = fakeCString(vObjectUStringZValue(curVO)); |
1911 | if (strcmp(_VCAL_VERSION, s) != 0) | 1911 | if (strcmp(_VCAL_VERSION, s) != 0) |
1912 | if (mEnableDialogs) | 1912 | if (mEnableDialogs) |
1913 | KMessageBox::sorry(mTopWidget, | 1913 | KMessageBox::sorry(mTopWidget, |
1914 | i18n("This vCalendar file has version %1.\n" | 1914 | i18n("This vCalendar file has version %1.\n" |
1915 | "We only support %2.") | 1915 | "We only support %2.") |
1916 | .arg(s).arg(_VCAL_VERSION), | 1916 | .arg(s).arg(_VCAL_VERSION), |
1917 | i18n("%1: Unknown vCalendar Version").arg(CalFormat::application())); | 1917 | i18n("%1: Unknown vCalendar Version").arg(CalFormat::application())); |
1918 | deleteStr(s); | 1918 | deleteStr(s); |
1919 | } | 1919 | } |
1920 | #endif | 1920 | #endif |
1921 | 1921 | ||
1922 | // custom properties | 1922 | // custom properties |
1923 | readCustomProperties(calendar, cal); | 1923 | readCustomProperties(calendar, cal); |
1924 | 1924 | ||
1925 | // TODO: set time zone | 1925 | // TODO: set time zone |
1926 | #if 0 | 1926 | #if 0 |
1927 | // set the time zone | 1927 | // set the time zone |
1928 | if ((curVO = isAPropertyOf(vcal, VCTimeZoneProp)) != 0) { | 1928 | if ((curVO = isAPropertyOf(vcal, VCTimeZoneProp)) != 0) { |
1929 | char *s = fakeCString(vObjectUStringZValue(curVO)); | 1929 | char *s = fakeCString(vObjectUStringZValue(curVO)); |
1930 | cal->setTimeZone(s); | 1930 | cal->setTimeZone(s); |
1931 | deleteStr(s); | 1931 | deleteStr(s); |
1932 | } | 1932 | } |
1933 | #endif | 1933 | #endif |
1934 | 1934 | ||
1935 | // Store all events with a relatedTo property in a list for post-processing | 1935 | // Store all events with a relatedTo property in a list for post-processing |
1936 | mEventsRelate.clear(); | 1936 | mEventsRelate.clear(); |
1937 | mTodosRelate.clear(); | 1937 | mTodosRelate.clear(); |
1938 | // TODO: make sure that only actually added ecvens go to this lists. | 1938 | // TODO: make sure that only actually added ecvens go to this lists. |
1939 | 1939 | ||
1940 | icalcomponent *c; | 1940 | icalcomponent *c; |
1941 | 1941 | ||
1942 | // Iterate through all todos | 1942 | // Iterate through all todos |
1943 | c = icalcomponent_get_first_component(calendar,ICAL_VTODO_COMPONENT); | 1943 | c = icalcomponent_get_first_component(calendar,ICAL_VTODO_COMPONENT); |
1944 | while (c) { | 1944 | while (c) { |
1945 | // kdDebug(5800) << "----Todo found" << endl; | 1945 | // kdDebug(5800) << "----Todo found" << endl; |
1946 | Todo *todo = readTodo(c); | 1946 | Todo *todo = readTodo(c); |
1947 | if (!cal->todo(todo->uid())) cal->addTodo(todo); | 1947 | if (!cal->todo(todo->uid())) |
1948 | cal->addTodo(todo); | ||
1948 | c = icalcomponent_get_next_component(calendar,ICAL_VTODO_COMPONENT); | 1949 | c = icalcomponent_get_next_component(calendar,ICAL_VTODO_COMPONENT); |
1949 | } | 1950 | } |
1950 | 1951 | ||
1951 | // Iterate through all events | 1952 | // Iterate through all events |
1952 | c = icalcomponent_get_first_component(calendar,ICAL_VEVENT_COMPONENT); | 1953 | c = icalcomponent_get_first_component(calendar,ICAL_VEVENT_COMPONENT); |
1953 | while (c) { | 1954 | while (c) { |
1954 | // kdDebug(5800) << "----Event found" << endl; | 1955 | // kdDebug(5800) << "----Event found" << endl; |
1955 | Event *event = readEvent(c); | 1956 | Event *event = readEvent(c); |
1956 | if (!cal->event(event->uid())) cal->addEvent(event); | 1957 | if (!cal->event(event->uid())) |
1958 | cal->addEvent(event); | ||
1957 | c = icalcomponent_get_next_component(calendar,ICAL_VEVENT_COMPONENT); | 1959 | c = icalcomponent_get_next_component(calendar,ICAL_VEVENT_COMPONENT); |
1958 | } | 1960 | } |
1959 | 1961 | ||
1960 | // Iterate through all journals | 1962 | // Iterate through all journals |
1961 | c = icalcomponent_get_first_component(calendar,ICAL_VJOURNAL_COMPONENT); | 1963 | c = icalcomponent_get_first_component(calendar,ICAL_VJOURNAL_COMPONENT); |
1962 | while (c) { | 1964 | while (c) { |
1963 | // kdDebug(5800) << "----Journal found" << endl; | 1965 | // kdDebug(5800) << "----Journal found" << endl; |
1964 | Journal *journal = readJournal(c); | 1966 | Journal *journal = readJournal(c); |
1965 | if (!cal->journal(journal->uid())) cal->addJournal(journal); | 1967 | if (!cal->journal(journal->uid())) |
1968 | cal->addJournal(journal); | ||
1966 | c = icalcomponent_get_next_component(calendar,ICAL_VJOURNAL_COMPONENT); | 1969 | c = icalcomponent_get_next_component(calendar,ICAL_VJOURNAL_COMPONENT); |
1967 | } | 1970 | } |
1968 | 1971 | ||
1969 | #if 0 | 1972 | #if 0 |
1970 | initPropIterator(&i, vcal); | 1973 | initPropIterator(&i, vcal); |
1971 | 1974 | ||
1972 | // go through all the vobjects in the vcal | 1975 | // go through all the vobjects in the vcal |
1973 | while (moreIteration(&i)) { | 1976 | while (moreIteration(&i)) { |
1974 | curVO = nextVObject(&i); | 1977 | curVO = nextVObject(&i); |
1975 | 1978 | ||
1976 | /************************************************************************/ | 1979 | /************************************************************************/ |
1977 | 1980 | ||
1978 | // now, check to see that the object is an event or todo. | 1981 | // now, check to see that the object is an event or todo. |
1979 | if (strcmp(vObjectName(curVO), VCEventProp) == 0) { | 1982 | if (strcmp(vObjectName(curVO), VCEventProp) == 0) { |
1980 | 1983 | ||
1981 | if ((curVOProp = isAPropertyOf(curVO, KPilotStatusProp)) != 0) { | 1984 | if ((curVOProp = isAPropertyOf(curVO, KPilotStatusProp)) != 0) { |
1982 | char *s; | 1985 | char *s; |
1983 | s = fakeCString(vObjectUStringZValue(curVOProp)); | 1986 | s = fakeCString(vObjectUStringZValue(curVOProp)); |
1984 | // check to see if event was deleted by the kpilot conduit | 1987 | // check to see if event was deleted by the kpilot conduit |
1985 | if (atoi(s) == Event::SYNCDEL) { | 1988 | if (atoi(s) == Event::SYNCDEL) { |
1986 | deleteStr(s); | 1989 | deleteStr(s); |
1987 | goto SKIP; | 1990 | goto SKIP; |
1988 | } | 1991 | } |
1989 | deleteStr(s); | 1992 | deleteStr(s); |
1990 | } | 1993 | } |
1991 | 1994 | ||
1992 | // this code checks to see if we are trying to read in an event | 1995 | // this code checks to see if we are trying to read in an event |
1993 | // that we already find to be in the calendar. If we find this | 1996 | // that we already find to be in the calendar. If we find this |
1994 | // to be the case, we skip the event. | 1997 | // to be the case, we skip the event. |
1995 | if ((curVOProp = isAPropertyOf(curVO, VCUniqueStringProp)) != 0) { | 1998 | if ((curVOProp = isAPropertyOf(curVO, VCUniqueStringProp)) != 0) { |
1996 | char *s = fakeCString(vObjectUStringZValue(curVOProp)); | 1999 | char *s = fakeCString(vObjectUStringZValue(curVOProp)); |
1997 | QString tmpStr(s); | 2000 | QString tmpStr(s); |
1998 | deleteStr(s); | 2001 | deleteStr(s); |
1999 | 2002 | ||
2000 | if (cal->event(tmpStr)) { | 2003 | if (cal->event(tmpStr)) { |
2001 | goto SKIP; | 2004 | goto SKIP; |
2002 | } | 2005 | } |
2003 | if (cal->todo(tmpStr)) { | 2006 | if (cal->todo(tmpStr)) { |
2004 | goto SKIP; | 2007 | goto SKIP; |
2005 | } | 2008 | } |
2006 | } | 2009 | } |
2007 | 2010 | ||
2008 | if ((!(curVOProp = isAPropertyOf(curVO, VCDTstartProp))) && | 2011 | if ((!(curVOProp = isAPropertyOf(curVO, VCDTstartProp))) && |
2009 | (!(curVOProp = isAPropertyOf(curVO, VCDTendProp)))) { | 2012 | (!(curVOProp = isAPropertyOf(curVO, VCDTendProp)))) { |
2010 | kdDebug(5800) << "found a VEvent with no DTSTART and no DTEND! Skipping..." << endl; | 2013 | kdDebug(5800) << "found a VEvent with no DTSTART and no DTEND! Skipping..." << endl; |
2011 | goto SKIP; | 2014 | goto SKIP; |
2012 | } | 2015 | } |
2013 | 2016 | ||
2014 | anEvent = VEventToEvent(curVO); | 2017 | anEvent = VEventToEvent(curVO); |
2015 | // we now use addEvent instead of insertEvent so that the | 2018 | // we now use addEvent instead of insertEvent so that the |
2016 | // signal/slot get connected. | 2019 | // signal/slot get connected. |
2017 | if (anEvent) | 2020 | if (anEvent) |
2018 | cal->addEvent(anEvent); | 2021 | cal->addEvent(anEvent); |
2019 | else { | 2022 | else { |
2020 | // some sort of error must have occurred while in translation. | 2023 | // some sort of error must have occurred while in translation. |
2021 | goto SKIP; | 2024 | goto SKIP; |
2022 | } | 2025 | } |
2023 | } else if (strcmp(vObjectName(curVO), VCTodoProp) == 0) { | 2026 | } else if (strcmp(vObjectName(curVO), VCTodoProp) == 0) { |
2024 | anEvent = VTodoToEvent(curVO); | 2027 | anEvent = VTodoToEvent(curVO); |
2025 | cal->addTodo(anEvent); | 2028 | cal->addTodo(anEvent); |
2026 | } else if ((strcmp(vObjectName(curVO), VCVersionProp) == 0) || | 2029 | } else if ((strcmp(vObjectName(curVO), VCVersionProp) == 0) || |
2027 | (strcmp(vObjectName(curVO), VCProdIdProp) == 0) || | 2030 | (strcmp(vObjectName(curVO), VCProdIdProp) == 0) || |
2028 | (strcmp(vObjectName(curVO), VCTimeZoneProp) == 0)) { | 2031 | (strcmp(vObjectName(curVO), VCTimeZoneProp) == 0)) { |
2029 | // do nothing, we know these properties and we want to skip them. | 2032 | // do nothing, we know these properties and we want to skip them. |
2030 | // we have either already processed them or are ignoring them. | 2033 | // we have either already processed them or are ignoring them. |
2031 | ; | 2034 | ; |
2032 | } else { | 2035 | } else { |
2033 | ; | 2036 | ; |
2034 | } | 2037 | } |
2035 | SKIP: | 2038 | SKIP: |
2036 | ; | 2039 | ; |
2037 | } // while | 2040 | } // while |
2038 | #endif | 2041 | #endif |
2039 | 2042 | ||
2040 | // Post-Process list of events with relations, put Event objects in relation | 2043 | // Post-Process list of events with relations, put Event objects in relation |
2041 | Event *ev; | 2044 | Event *ev; |
2042 | for ( ev=mEventsRelate.first(); ev != 0; ev=mEventsRelate.next() ) { | 2045 | for ( ev=mEventsRelate.first(); ev != 0; ev=mEventsRelate.next() ) { |
2043 | Incidence * inc = cal->event(ev->relatedToUid()); | 2046 | Incidence * inc = cal->event(ev->relatedToUid()); |
2044 | if ( inc ) | 2047 | if ( inc ) |
2045 | ev->setRelatedTo( inc ); | 2048 | ev->setRelatedTo( inc ); |
2046 | } | 2049 | } |
2047 | Todo *todo; | 2050 | Todo *todo; |
2048 | for ( todo=mTodosRelate.first(); todo != 0; todo=mTodosRelate.next() ) { | 2051 | for ( todo=mTodosRelate.first(); todo != 0; todo=mTodosRelate.next() ) { |
2049 | Incidence * inc = cal->todo(todo->relatedToUid()); | 2052 | Incidence * inc = cal->todo(todo->relatedToUid()); |
2050 | if ( inc ) | 2053 | if ( inc ) |
2051 | todo->setRelatedTo( inc ); | 2054 | todo->setRelatedTo( inc ); |
2052 | } | 2055 | } |
2053 | 2056 | ||
2054 | return true; | 2057 | return true; |
2055 | } | 2058 | } |
2056 | 2059 | ||
2057 | QString ICalFormatImpl::extractErrorProperty(icalcomponent *c) | 2060 | QString ICalFormatImpl::extractErrorProperty(icalcomponent *c) |
2058 | { | 2061 | { |
2059 | // kdDebug(5800) << "ICalFormatImpl:extractErrorProperty: " | 2062 | // kdDebug(5800) << "ICalFormatImpl:extractErrorProperty: " |
2060 | // << icalcomponent_as_ical_string(c) << endl; | 2063 | // << icalcomponent_as_ical_string(c) << endl; |
2061 | 2064 | ||
diff --git a/libkcal/journal.cpp b/libkcal/journal.cpp index 859161f..c4e4474 100644 --- a/libkcal/journal.cpp +++ b/libkcal/journal.cpp | |||
@@ -1,49 +1,51 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkcal. | 2 | This file is part of libkcal. |
3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> |
4 | 4 | ||
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
6 | modify it under the terms of the GNU Library General Public | 6 | modify it under the terms of the GNU Library General Public |
7 | License as published by the Free Software Foundation; either | 7 | License as published by the Free Software Foundation; either |
8 | version 2 of the License, or (at your option) any later version. | 8 | version 2 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include "journal.h" | 21 | #include "journal.h" |
22 | 22 | ||
23 | using namespace KCal; | 23 | using namespace KCal; |
24 | 24 | ||
25 | Journal::Journal() | 25 | Journal::Journal() |
26 | { | 26 | { |
27 | qDebug("New JJJ "); | ||
27 | } | 28 | } |
28 | 29 | ||
29 | Journal::~Journal() | 30 | Journal::~Journal() |
30 | { | 31 | { |
32 | qDebug("delete JJJ "); | ||
31 | } | 33 | } |
32 | 34 | ||
33 | Incidence *Journal::clone() | 35 | Incidence *Journal::clone() |
34 | { | 36 | { |
35 | return new Journal(*this); | 37 | return new Journal(*this); |
36 | } | 38 | } |
37 | 39 | ||
38 | 40 | ||
39 | bool KCal::operator==( const Journal& j1, const Journal& j2 ) | 41 | bool KCal::operator==( const Journal& j1, const Journal& j2 ) |
40 | { | 42 | { |
41 | return operator==( (const Incidence&)j1, (const Incidence&)j2 ); | 43 | return operator==( (const Incidence&)j1, (const Incidence&)j2 ); |
42 | } | 44 | } |
43 | 45 | ||
44 | 46 | ||
45 | QDateTime Journal::getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const | 47 | QDateTime Journal::getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const |
46 | { | 48 | { |
47 | *ok = false; | 49 | *ok = false; |
48 | return QDateTime (); | 50 | return QDateTime (); |
49 | } | 51 | } |