-rw-r--r-- | libkcal/vcalformat.cpp | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp index 2e19740..9cbaf16 100644 --- a/libkcal/vcalformat.cpp +++ b/libkcal/vcalformat.cpp | |||
@@ -22,11 +22,13 @@ | |||
22 | #include <qapplication.h> | 22 | #include <qapplication.h> |
23 | #include <qdatetime.h> | 23 | #include <qdatetime.h> |
24 | #include <qstring.h> | 24 | #include <qstring.h> |
25 | #include <qptrlist.h> | 25 | #include <q3ptrlist.h> |
26 | #include <qregexp.h> | 26 | #include <qregexp.h> |
27 | #include <qclipboard.h> | 27 | #include <qclipboard.h> |
28 | #include <qdialog.h> | 28 | #include <qdialog.h> |
29 | #include <qfile.h> | 29 | #include <qfile.h> |
30 | //Added by qt3to4: | ||
31 | #include <Q3CString> | ||
30 | 32 | ||
31 | #include <kdebug.h> | 33 | #include <kdebug.h> |
32 | #include <kglobal.h> | 34 | #include <kglobal.h> |
@@ -108,15 +110,15 @@ bool VCalFormat::save(Calendar *calendar, const QString &fileName) | |||
108 | addPropValue(vcal,VCVersionProp, _VCAL_VERSION); | 110 | addPropValue(vcal,VCVersionProp, _VCAL_VERSION); |
109 | 111 | ||
110 | // TODO STUFF | 112 | // TODO STUFF |
111 | QPtrList<Todo> todoList = mCalendar->rawTodos(); | 113 | Q3PtrList<Todo> todoList = mCalendar->rawTodos(); |
112 | QPtrListIterator<Todo> qlt(todoList); | 114 | Q3PtrListIterator<Todo> qlt(todoList); |
113 | for (; qlt.current(); ++qlt) { | 115 | for (; qlt.current(); ++qlt) { |
114 | vo = eventToVTodo(qlt.current()); | 116 | vo = eventToVTodo(qlt.current()); |
115 | addVObjectProp(vcal, vo); | 117 | addVObjectProp(vcal, vo); |
116 | } | 118 | } |
117 | 119 | ||
118 | // EVENT STUFF | 120 | // EVENT STUFF |
119 | QPtrList<Event> events = mCalendar->rawEvents(); | 121 | Q3PtrList<Event> events = mCalendar->rawEvents(); |
120 | Event *ev; | 122 | Event *ev; |
121 | for(ev=events.first();ev;ev=events.next()) { | 123 | for(ev=events.first();ev;ev=events.next()) { |
122 | vo = eventToVEvent(ev); | 124 | vo = eventToVEvent(ev); |
@@ -138,7 +140,7 @@ bool VCalFormat::fromString( Calendar *calendar, const QString &text ) | |||
138 | { | 140 | { |
139 | // TODO: Factor out VCalFormat::fromString() | 141 | // TODO: Factor out VCalFormat::fromString() |
140 | 142 | ||
141 | QCString data = text.utf8(); | 143 | Q3CString data = text.utf8(); |
142 | 144 | ||
143 | if ( !data.size() ) return false; | 145 | if ( !data.size() ) return false; |
144 | 146 | ||
@@ -210,7 +212,7 @@ QString VCalFormat::toString( Calendar *calendar ) | |||
210 | addPropValue( vcal, VCVersionProp, _VCAL_VERSION ); | 212 | addPropValue( vcal, VCVersionProp, _VCAL_VERSION ); |
211 | 213 | ||
212 | // TODO: Use all data. | 214 | // TODO: Use all data. |
213 | QPtrList<Event> events = calendar->events(); | 215 | Q3PtrList<Event> events = calendar->events(); |
214 | Event *event = events.first(); | 216 | Event *event = events.first(); |
215 | if ( !event ) return QString::null; | 217 | if ( !event ) return QString::null; |
216 | 218 | ||
@@ -271,8 +273,8 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent) | |||
271 | 273 | ||
272 | // attendees | 274 | // attendees |
273 | if (anEvent->attendeeCount() != 0) { | 275 | if (anEvent->attendeeCount() != 0) { |
274 | QPtrList<Attendee> al = anEvent->attendees(); | 276 | Q3PtrList<Attendee> al = anEvent->attendees(); |
275 | QPtrListIterator<Attendee> ai(al); | 277 | Q3PtrListIterator<Attendee> ai(al); |
276 | Attendee *curAttendee; | 278 | Attendee *curAttendee; |
277 | 279 | ||
278 | for (; ai.current(); ++ai) { | 280 | for (; ai.current(); ++ai) { |
@@ -326,7 +328,7 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent) | |||
326 | addPropValue(vtodo, VCPriorityProp, tmpStr.local8Bit()); | 328 | addPropValue(vtodo, VCPriorityProp, tmpStr.local8Bit()); |
327 | 329 | ||
328 | // related event | 330 | // related event |
329 | if (anEvent->relatedToUid()) { | 331 | if (!anEvent->relatedToUid().isEmpty()) { |
330 | addPropValue(vtodo, VCRelatedToProp, | 332 | addPropValue(vtodo, VCRelatedToProp, |
331 | anEvent->relatedToUid().local8Bit()); | 333 | anEvent->relatedToUid().local8Bit()); |
332 | } | 334 | } |
@@ -355,7 +357,7 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent) | |||
355 | 357 | ||
356 | // alarm stuff | 358 | // alarm stuff |
357 | kdDebug(5800) << "vcalformat::eventToVTodo was called" << endl; | 359 | kdDebug(5800) << "vcalformat::eventToVTodo was called" << endl; |
358 | QPtrList<Alarm> alarms = anEvent->alarms(); | 360 | Q3PtrList<Alarm> alarms = anEvent->alarms(); |
359 | Alarm* alarm; | 361 | Alarm* alarm; |
360 | for (alarm = alarms.first(); alarm; alarm = alarms.next()) { | 362 | for (alarm = alarms.first(); alarm; alarm = alarms.next()) { |
361 | if (alarm->enabled()) { | 363 | if (alarm->enabled()) { |
@@ -433,8 +435,8 @@ VObject* VCalFormat::eventToVEvent(Event *anEvent) | |||
433 | addPropValue(vevent, ICOrganizerProp, tmpStr.local8Bit()); | 435 | addPropValue(vevent, ICOrganizerProp, tmpStr.local8Bit()); |
434 | 436 | ||
435 | if (anEvent->attendeeCount() != 0) { | 437 | if (anEvent->attendeeCount() != 0) { |
436 | QPtrList<Attendee> al = anEvent->attendees(); | 438 | Q3PtrList<Attendee> al = anEvent->attendees(); |
437 | QPtrListIterator<Attendee> ai(al); | 439 | Q3PtrListIterator<Attendee> ai(al); |
438 | Attendee *curAttendee; | 440 | Attendee *curAttendee; |
439 | 441 | ||
440 | // TODO: Put this functionality into Attendee class | 442 | // TODO: Put this functionality into Attendee class |
@@ -461,8 +463,8 @@ VObject* VCalFormat::eventToVEvent(Event *anEvent) | |||
461 | // recurrence rule stuff | 463 | // recurrence rule stuff |
462 | if (anEvent->doesRecur()) { | 464 | if (anEvent->doesRecur()) { |
463 | // some more variables | 465 | // some more variables |
464 | QPtrList<Recurrence::rMonthPos> tmpPositions; | 466 | Q3PtrList<Recurrence::rMonthPos> tmpPositions; |
465 | QPtrList<int> tmpDays; | 467 | Q3PtrList<int> tmpDays; |
466 | int *tmpDay; | 468 | int *tmpDay; |
467 | Recurrence::rMonthPos *tmpPos; | 469 | Recurrence::rMonthPos *tmpPos; |
468 | QString tmpStr2; | 470 | QString tmpStr2; |
@@ -545,7 +547,7 @@ VObject* VCalFormat::eventToVEvent(Event *anEvent) | |||
545 | } else if (anEvent->recurrence()->duration() == -1) { | 547 | } else if (anEvent->recurrence()->duration() == -1) { |
546 | tmpStr += "#0"; // defined as repeat forever | 548 | tmpStr += "#0"; // defined as repeat forever |
547 | } else { | 549 | } else { |
548 | tmpStr += qDateTimeToISO(anEvent->recurrence()->endDate(), FALSE); | 550 | tmpStr += qDateTimeToISO((QDateTime)anEvent->recurrence()->endDate(), FALSE); |
549 | } | 551 | } |
550 | addPropValue(vevent,VCRRuleProp, tmpStr.local8Bit()); | 552 | addPropValue(vevent,VCRRuleProp, tmpStr.local8Bit()); |
551 | 553 | ||
@@ -625,7 +627,7 @@ VObject* VCalFormat::eventToVEvent(Event *anEvent) | |||
625 | 627 | ||
626 | // attachments | 628 | // attachments |
627 | // TODO: handle binary attachments! | 629 | // TODO: handle binary attachments! |
628 | QPtrList<Attachment> attachments = anEvent->attachments(); | 630 | Q3PtrList<Attachment> attachments = anEvent->attachments(); |
629 | for ( Attachment *at = attachments.first(); at; at = attachments.next() ) | 631 | for ( Attachment *at = attachments.first(); at; at = attachments.next() ) |
630 | addPropValue(vevent, VCAttachProp, at->uri().local8Bit()); | 632 | addPropValue(vevent, VCAttachProp, at->uri().local8Bit()); |
631 | 633 | ||
@@ -636,7 +638,7 @@ VObject* VCalFormat::eventToVEvent(Event *anEvent) | |||
636 | addPropValue(vevent, VCResourcesProp, tmpStr.local8Bit()); | 638 | addPropValue(vevent, VCResourcesProp, tmpStr.local8Bit()); |
637 | 639 | ||
638 | // alarm stuff | 640 | // alarm stuff |
639 | QPtrList<Alarm> alarms = anEvent->alarms(); | 641 | Q3PtrList<Alarm> alarms = anEvent->alarms(); |
640 | Alarm* alarm; | 642 | Alarm* alarm; |
641 | for (alarm = alarms.first(); alarm; alarm = alarms.next()) { | 643 | for (alarm = alarms.first(); alarm; alarm = alarms.next()) { |
642 | if (alarm->enabled()) { | 644 | if (alarm->enabled()) { |
@@ -672,7 +674,7 @@ VObject* VCalFormat::eventToVEvent(Event *anEvent) | |||
672 | addPropValue(vevent, VCTranspProp, tmpStr.local8Bit()); | 674 | addPropValue(vevent, VCTranspProp, tmpStr.local8Bit()); |
673 | 675 | ||
674 | // related event | 676 | // related event |
675 | if (anEvent->relatedToUid()) { | 677 | if (!anEvent->relatedToUid().isEmpty()) { |
676 | addPropValue(vevent, VCRelatedToProp, | 678 | addPropValue(vevent, VCRelatedToProp, |
677 | anEvent->relatedToUid().local8Bit()); | 679 | anEvent->relatedToUid().local8Bit()); |
678 | } | 680 | } |
@@ -1408,7 +1410,7 @@ QString VCalFormat::qDateToISO(const QDate &qd) | |||
1408 | { | 1410 | { |
1409 | QString tmpStr; | 1411 | QString tmpStr; |
1410 | 1412 | ||
1411 | ASSERT(qd.isValid()); | 1413 | Q_ASSERT(qd.isValid()); |
1412 | 1414 | ||
1413 | tmpStr.sprintf("%.2d%.2d%.2d", | 1415 | tmpStr.sprintf("%.2d%.2d%.2d", |
1414 | qd.year(), qd.month(), qd.day()); | 1416 | qd.year(), qd.month(), qd.day()); |
@@ -1420,8 +1422,8 @@ QString VCalFormat::qDateTimeToISO(const QDateTime &qdt, bool zulu) | |||
1420 | { | 1422 | { |
1421 | QString tmpStr; | 1423 | QString tmpStr; |
1422 | 1424 | ||
1423 | ASSERT(qdt.date().isValid()); | 1425 | Q_ASSERT(qdt.date().isValid()); |
1424 | ASSERT(qdt.time().isValid()); | 1426 | Q_ASSERT(qdt.time().isValid()); |
1425 | if (zulu && !useLocalTime ) { | 1427 | if (zulu && !useLocalTime ) { |
1426 | QDateTime tmpDT = qdt.addSecs ( -KGlobal::locale()->localTimeOffset( qdt )*60); | 1428 | QDateTime tmpDT = qdt.addSecs ( -KGlobal::locale()->localTimeOffset( qdt )*60); |
1427 | tmpStr.sprintf("%.2d%.2d%.2dT%.2d%.2d%.2dZ", | 1429 | tmpStr.sprintf("%.2d%.2d%.2dT%.2d%.2d%.2dZ", |
@@ -1454,8 +1456,8 @@ QDateTime VCalFormat::ISOToQDateTime(const QString & dtStr) | |||
1454 | tmpDate.setYMD(year, month, day); | 1456 | tmpDate.setYMD(year, month, day); |
1455 | tmpTime.setHMS(hour, minute, second); | 1457 | tmpTime.setHMS(hour, minute, second); |
1456 | 1458 | ||
1457 | ASSERT(tmpDate.isValid()); | 1459 | Q_ASSERT(tmpDate.isValid()); |
1458 | ASSERT(tmpTime.isValid()); | 1460 | Q_ASSERT(tmpTime.isValid()); |
1459 | QDateTime tmpDT(tmpDate, tmpTime); | 1461 | QDateTime tmpDT(tmpDate, tmpTime); |
1460 | // correct for GMT if string is in Zulu format | 1462 | // correct for GMT if string is in Zulu format |
1461 | if (dtStr.at(dtStr.length()-1) == 'Z') | 1463 | if (dtStr.at(dtStr.length()-1) == 'Z') |
@@ -1648,7 +1650,7 @@ Attendee::Role VCalFormat::readRole(const char *s) const | |||
1648 | return role; | 1650 | return role; |
1649 | } | 1651 | } |
1650 | 1652 | ||
1651 | QCString VCalFormat::writeRole(Attendee::Role role) const | 1653 | Q3CString VCalFormat::writeRole(Attendee::Role role) const |
1652 | { | 1654 | { |
1653 | if ( role == Attendee::Chair ) | 1655 | if ( role == Attendee::Chair ) |
1654 | return "OWNER"; | 1656 | return "OWNER"; |
@@ -1686,7 +1688,7 @@ Attendee::PartStat VCalFormat::readStatus(const char *s) const | |||
1686 | return status; | 1688 | return status; |
1687 | } | 1689 | } |
1688 | 1690 | ||
1689 | QCString VCalFormat::writeStatus(Attendee::PartStat status) const | 1691 | Q3CString VCalFormat::writeStatus(Attendee::PartStat status) const |
1690 | { | 1692 | { |
1691 | switch(status) { | 1693 | switch(status) { |
1692 | default: | 1694 | default: |