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
@@ -24,3 +24,3 @@
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qregexp.h>
@@ -29,2 +29,4 @@
 #include <qfile.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -110,4 +112,4 @@ bool VCalFormat::save(Calendar *calendar, const QString &fileName)
   // TODO STUFF
-  QPtrList<Todo> todoList = mCalendar->rawTodos();
-  QPtrListIterator<Todo> qlt(todoList);
+  Q3PtrList<Todo> todoList = mCalendar->rawTodos();
+  Q3PtrListIterator<Todo> qlt(todoList);
   for (; qlt.current(); ++qlt) {
@@ -118,3 +120,3 @@ bool VCalFormat::save(Calendar *calendar, const QString &fileName)
   // EVENT STUFF
-  QPtrList<Event> events = mCalendar->rawEvents();
+  Q3PtrList<Event> events = mCalendar->rawEvents();
   Event *ev;
@@ -140,3 +142,3 @@ bool VCalFormat::fromString( Calendar *calendar, const QString &text )
 
-  QCString data = text.utf8();
+  Q3CString data = text.utf8();
 
@@ -212,3 +214,3 @@ QString VCalFormat::toString( Calendar *calendar )
   // TODO: Use all data.
-  QPtrList<Event> events = calendar->events();
+  Q3PtrList<Event> events = calendar->events();
   Event *event = events.first();
@@ -273,4 +275,4 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
   if (anEvent->attendeeCount() != 0) {
-    QPtrList<Attendee> al = anEvent->attendees();
-    QPtrListIterator<Attendee> ai(al);
+    Q3PtrList<Attendee> al = anEvent->attendees();
+    Q3PtrListIterator<Attendee> ai(al);
     Attendee *curAttendee;
@@ -328,3 +330,3 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
   // related event
-  if (anEvent->relatedToUid()) {
+  if (!anEvent->relatedToUid().isEmpty()) {
     addPropValue(vtodo, VCRelatedToProp,
@@ -357,3 +359,3 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
   kdDebug(5800) << "vcalformat::eventToVTodo was called" << endl;
-  QPtrList<Alarm> alarms = anEvent->alarms();
+  Q3PtrList<Alarm> alarms = anEvent->alarms();
   Alarm* alarm;
@@ -435,4 +437,4 @@ VObject* VCalFormat::eventToVEvent(Event *anEvent)
   if (anEvent->attendeeCount() != 0) {
-    QPtrList<Attendee> al = anEvent->attendees();
-    QPtrListIterator<Attendee> ai(al);
+    Q3PtrList<Attendee> al = anEvent->attendees();
+    Q3PtrListIterator<Attendee> ai(al);
     Attendee *curAttendee;
@@ -463,4 +465,4 @@ VObject* VCalFormat::eventToVEvent(Event *anEvent)
     // some more variables
-    QPtrList<Recurrence::rMonthPos> tmpPositions;
-    QPtrList<int> tmpDays;
+    Q3PtrList<Recurrence::rMonthPos> tmpPositions;
+    Q3PtrList<int> tmpDays;
     int *tmpDay;
@@ -547,3 +549,3 @@ VObject* VCalFormat::eventToVEvent(Event *anEvent)
     } else {
-      tmpStr += qDateTimeToISO(anEvent->recurrence()->endDate(), FALSE);
+      tmpStr += qDateTimeToISO((QDateTime)anEvent->recurrence()->endDate(), FALSE);
     }
@@ -627,3 +629,3 @@ VObject* VCalFormat::eventToVEvent(Event *anEvent)
   // TODO: handle binary attachments!
-  QPtrList<Attachment> attachments = anEvent->attachments();
+  Q3PtrList<Attachment> attachments = anEvent->attachments();
   for ( Attachment *at = attachments.first(); at; at = attachments.next() )
@@ -638,3 +640,3 @@ VObject* VCalFormat::eventToVEvent(Event *anEvent)
   // alarm stuff
-  QPtrList<Alarm> alarms = anEvent->alarms();
+  Q3PtrList<Alarm> alarms = anEvent->alarms();
   Alarm* alarm;
@@ -674,3 +676,3 @@ VObject* VCalFormat::eventToVEvent(Event *anEvent)
   // related event
-  if (anEvent->relatedToUid()) {
+  if (!anEvent->relatedToUid().isEmpty()) {
     addPropValue(vevent, VCRelatedToProp,
@@ -1410,3 +1412,3 @@ QString VCalFormat::qDateToISO(const QDate &qd)
 
-  ASSERT(qd.isValid());
+  Q_ASSERT(qd.isValid());
 
@@ -1422,4 +1424,4 @@ QString VCalFormat::qDateTimeToISO(const QDateTime &qdt, bool zulu)
 
-  ASSERT(qdt.date().isValid());
-  ASSERT(qdt.time().isValid());
+  Q_ASSERT(qdt.date().isValid());
+  Q_ASSERT(qdt.time().isValid());
   if (zulu && !useLocalTime ) {
@@ -1456,4 +1458,4 @@ QDateTime VCalFormat::ISOToQDateTime(const QString & dtStr)
 
-  ASSERT(tmpDate.isValid());
-  ASSERT(tmpTime.isValid());
+  Q_ASSERT(tmpDate.isValid());
+  Q_ASSERT(tmpTime.isValid());
   QDateTime tmpDT(tmpDate, tmpTime);
@@ -1650,3 +1652,3 @@ Attendee::Role VCalFormat::readRole(const char *s) const
 
-QCString VCalFormat::writeRole(Attendee::Role role) const
+Q3CString VCalFormat::writeRole(Attendee::Role role) const
 {
@@ -1688,3 +1690,3 @@ Attendee::PartStat VCalFormat::readStatus(const char *s) const
 
-QCString VCalFormat::writeStatus(Attendee::PartStat status) const
+Q3CString VCalFormat::writeStatus(Attendee::PartStat status) const
 {