1 files changed, 33 insertions, 33 deletions

diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index ce3cd09..cb52b7c 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -24,3 +24,3 @@
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
@@ -194,3 +194,3 @@ bool CalendarLocal::mergeCalendar( Calendar* remote  )
     //   if not in local, add it to default calendar
-    QPtrList<Incidence> localInc = rawIncidences(); 
+    Q3PtrList<Incidence> localInc = rawIncidences(); 
     Incidence* inL = localInc.first(); 
@@ -202,3 +202,3 @@ bool CalendarLocal::mergeCalendar( Calendar* remote  )
     }
-    QPtrList<Incidence> er = remote->rawIncidences(); 
+    Q3PtrList<Incidence> er = remote->rawIncidences(); 
     Incidence* inR = er.first();
@@ -261,5 +261,5 @@ void CalendarLocal::addCalendar( Calendar* cal )
     setSyncEventsEnabled();
-    QPtrList<Incidence> incList;
+    Q3PtrList<Incidence> incList;
     {
-        QPtrList<Event> EventList = cal->rawEvents();
+        Q3PtrList<Event> EventList = cal->rawEvents();
         Event * ev = EventList.first();
@@ -281,3 +281,3 @@ void CalendarLocal::addCalendar( Calendar* cal )
 
-        QPtrList<Todo> TodoList = cal->rawTodos();
+        Q3PtrList<Todo> TodoList = cal->rawTodos();
         Todo * ev = TodoList.first();
@@ -301,3 +301,3 @@ void CalendarLocal::addCalendar( Calendar* cal )
     {
-        QPtrList<Journal> JournalList = cal->journals();
+        Q3PtrList<Journal> JournalList = cal->journals();
         Journal * ev = JournalList.first();
@@ -483,5 +483,5 @@ void CalendarLocal::deleteTodo( Todo *todo )
 
-QPtrList<Todo> CalendarLocal::rawTodos()
+Q3PtrList<Todo> CalendarLocal::rawTodos()
 {
-    QPtrList<Todo> el;
+    Q3PtrList<Todo> el;
     for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
@@ -501,3 +501,3 @@ void CalendarLocal::removeSyncInfo( QString syncProfile)
 {
-    QPtrList<Incidence> all = rawIncidences() ;
+    Q3PtrList<Incidence> all = rawIncidences() ;
     Incidence *inc;
@@ -507,3 +507,3 @@ void CalendarLocal::removeSyncInfo( QString syncProfile)
     if ( syncProfile.isEmpty() ) {
-        QPtrList<Event> el;
+        Q3PtrList<Event> el;
         Event *todo;
@@ -522,5 +522,5 @@ void CalendarLocal::removeSyncInfo( QString syncProfile)
 }
-QPtrList<Event> CalendarLocal::getExternLastSyncEvents()
+Q3PtrList<Event> CalendarLocal::getExternLastSyncEvents()
 {
-    QPtrList<Event> el;
+    Q3PtrList<Event> el;
     Event *todo;
@@ -687,5 +687,5 @@ void CalendarLocal::deRegisterAlarm()
 
-QPtrList<Todo> CalendarLocal::todos( const QDate &date )
+Q3PtrList<Todo> CalendarLocal::todos( const QDate &date )
 {
-  QPtrList<Todo> todos;
+  Q3PtrList<Todo> todos;
 
@@ -788,3 +788,3 @@ void CalendarLocal::appendAlarms( Alarm::List &alarms, Incidence *incidence,
 {
-  QPtrList<Alarm> alarmList = incidence->alarms();
+  Q3PtrList<Alarm> alarmList = incidence->alarms();
   Alarm *alarm;
@@ -807,3 +807,3 @@ void CalendarLocal::appendRecurringAlarms( Alarm::List &alarms,
  
-  QPtrList<Alarm> alarmList = incidence->alarms();
+  Q3PtrList<Alarm> alarmList = incidence->alarms();
   Alarm *alarm;
@@ -846,5 +846,5 @@ void CalendarLocal::insertEvent( Event *event )
 
-QPtrList<Event> CalendarLocal::rawEventsForDate( const QDate &qd, bool sorted )
+Q3PtrList<Event> CalendarLocal::rawEventsForDate( const QDate &qd, bool sorted )
 {
-  QPtrList<Event> eventList;
+  Q3PtrList<Event> eventList;
 
@@ -880,3 +880,3 @@ QPtrList<Event> CalendarLocal::rawEventsForDate( const QDate &qd, bool sorted )
   // now, we have to sort it based on dtStart.time()
-  QPtrList<Event> eventListSorted;
+  Q3PtrList<Event> eventListSorted;
   Event *sortEvent;
@@ -896,3 +896,3 @@ QPtrList<Event> CalendarLocal::rawEventsForDate( const QDate &qd, bool sorted )
 
-QPtrList<Event> CalendarLocal::rawEvents( const QDate &start, const QDate &end,
+Q3PtrList<Event> CalendarLocal::rawEvents( const QDate &start, const QDate &end,
                                           bool inclusive )
@@ -901,3 +901,3 @@ QPtrList<Event> CalendarLocal::rawEvents( const QDate &start, const QDate &end,
 
-  QPtrList<Event> eventList;
+  Q3PtrList<Event> eventList;
 
@@ -925,3 +925,3 @@ QPtrList<Event> CalendarLocal::rawEvents( const QDate &start, const QDate &end,
           bool founOne;
-          QDate next = event->getNextOccurence( start, &founOne ).date();
+          QDate next = event->getNextOccurence( (QDateTime)start, &founOne ).date();
           if ( founOne ) {
@@ -974,3 +974,3 @@ QPtrList<Event> CalendarLocal::rawEvents( const QDate &start, const QDate &end,
 
-QPtrList<Event> CalendarLocal::rawEventsForDate( const QDateTime &qdt )
+Q3PtrList<Event> CalendarLocal::rawEventsForDate( const QDateTime &qdt )
 {
@@ -979,5 +979,5 @@ QPtrList<Event> CalendarLocal::rawEventsForDate( const QDateTime &qdt )
 
-QPtrList<Event> CalendarLocal::rawEvents()
+Q3PtrList<Event> CalendarLocal::rawEvents()
 {
-    QPtrList<Event> el;
+    Q3PtrList<Event> el;
     for ( Event *it = mEventList.first(); it; it = mEventList.next() )
@@ -1008,5 +1008,5 @@ void CalendarLocal::deleteJournal( Journal *journal )
 
-QPtrList<Journal> CalendarLocal::journals4Date( const QDate & date )
+Q3PtrList<Journal> CalendarLocal::journals4Date( const QDate & date )
 {
-    QPtrList<Journal> el;
+    Q3PtrList<Journal> el;
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
@@ -1042,5 +1042,5 @@ Journal *CalendarLocal::journal( const QString &uid )
 
-QPtrList<Journal> CalendarLocal::journals()
+Q3PtrList<Journal> CalendarLocal::journals()
 {
-    QPtrList<Journal> el;
+    Q3PtrList<Journal> el;
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
@@ -1053,3 +1053,3 @@ void CalendarLocal::setCalendarRemove( int id )
     {
-        QPtrList<Event> EventList = mEventList;
+        Q3PtrList<Event> EventList = mEventList;
         Event * ev = EventList.first();
@@ -1063,3 +1063,3 @@ void CalendarLocal::setCalendarRemove( int id )
 
-        QPtrList<Todo> TodoList = mTodoList;
+        Q3PtrList<Todo> TodoList = mTodoList;
         Todo * ev = TodoList.first();
@@ -1072,3 +1072,3 @@ void CalendarLocal::setCalendarRemove( int id )
     {
-        QPtrList<Journal> JournalList = mJournalList;
+        Q3PtrList<Journal> JournalList = mJournalList;
         Journal * ev = JournalList.first();