initial public commit of qt4 portp1

50 files changed, 521 insertions, 449 deletions

diff --git a/libkcal/alarm.cpp b/libkcal/alarm.cpp
index 3157214..3c4a81c 100644
--- a/libkcal/alarm.cpp
+++ b/libkcal/alarm.cpp
@@ -27,4 +27,6 @@
 
 #include "alarm.h"
+//Added by qt3to4:
+#include <Q3ValueList>
 
 using namespace KCal;
@@ -213,5 +215,5 @@ QString Alarm::programArguments() const
 
 void Alarm::setEmailAlarm(const QString &subject, const QString &text,
-                          const QValueList<Person> &addressees, const QStringList &attachments)
+                          const Q3ValueList<Person> &addressees, const QStringList &attachments)
 {
   mType = Email;
@@ -232,5 +234,5 @@ void Alarm::setMailAddress(const Person &mailAddress)
 }
 
-void Alarm::setMailAddresses(const QValueList<Person> &mailAddresses)
+void Alarm::setMailAddresses(const Q3ValueList<Person> &mailAddresses)
 {
   if (mType == Email) {
@@ -248,7 +250,7 @@ void Alarm::addMailAddress(const Person &mailAddress)
 }
 
-QValueList<Person> Alarm::mailAddresses() const
+Q3ValueList<Person> Alarm::mailAddresses() const
 {
-  return (mType == Email) ? mMailAddresses : QValueList<Person>();
+  return (mType == Email) ? mMailAddresses : Q3ValueList<Person>();
 }
 
diff --git a/libkcal/alarm.h b/libkcal/alarm.h
index ac6ea0d..b24f0f7 100644
--- a/libkcal/alarm.h
+++ b/libkcal/alarm.h
@@ -23,5 +23,5 @@
 
 #include <qstring.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 #include "customproperties.h"
@@ -40,5 +40,5 @@ class Alarm : public CustomProperties
   public:
     enum Type { Invalid, Display, Procedure, Email, Audio };
-    typedef QValueList<Alarm *> List;
+    typedef Q3ValueList<Alarm *> List;
 
     /** Construct a new alarm with variables initialized to "sane" values. */
@@ -113,5 +113,5 @@ class Alarm : public CustomProperties
         @param attachments optional names of files to attach to the email.
      */
-    void setEmailAlarm(const QString &subject, const QString &text, const QValueList<Person> &addressees,
+    void setEmailAlarm(const QString &subject, const QString &text, const Q3ValueList<Person> &addressees,
                        const QStringList &attachments = QStringList());
 
@@ -123,5 +123,5 @@ class Alarm : public CustomProperties
         Ignored if the alarm is not an email alarm.
      */
-    void setMailAddresses(const QValueList<Person> &mailAlarmAddresses);
+    void setMailAddresses(const Q3ValueList<Person> &mailAlarmAddresses);
     /** Add this address to the list of addresses to send mail to when the alarm is triggered.
         Ignored if the alarm is not an email alarm.
@@ -129,5 +129,5 @@ class Alarm : public CustomProperties
     void addMailAddress(const Person &mailAlarmAddress);
     /** return the addresses to send mail to when an alarm goes off */
-    QValueList<Person> mailAddresses() const;
+    Q3ValueList<Person> mailAddresses() const;
 
     /** Set the subject line of the mail.
@@ -227,5 +227,5 @@ class Alarm : public CustomProperties
     QString mFile;               // procedure program to run/optional audio file to play
     QStringList mMailAttachFiles;      // filenames to attach to email
-    QValueList<Person> mMailAddresses; // who to mail for reminder
+    Q3ValueList<Person> mMailAddresses; // who to mail for reminder
     QString mMailSubject;        // subject of email
 
diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp
index 9b38d3f..bf095cf 100644
--- a/libkcal/calendar.cpp
+++ b/libkcal/calendar.cpp
@@ -31,4 +31,6 @@
 #include "calendar.h"
 #include "syncdefines.h"
+//Added by qt3to4:
+#include <Q3PtrList>
 
 using namespace KCal;
@@ -272,17 +274,17 @@ CalFilter *Calendar::filter()
 }
 
-QPtrList<Incidence> Calendar::incidences()
+Q3PtrList<Incidence> Calendar::incidences()
 {
-  QPtrList<Incidence> incidences;
+  Q3PtrList<Incidence> incidences;
   
   Incidence *i;
 
-  QPtrList<Event> e = events();
+  Q3PtrList<Event> e = events();
   for( i = e.first(); i; i = e.next() ) incidences.append( i );
 
-  QPtrList<Todo> t = todos();
+  Q3PtrList<Todo> t = todos();
   for( i = t.first(); i; i = t.next() ) incidences.append( i );
 
-  QPtrList<Journal> j = journals();
+  Q3PtrList<Journal> j = journals();
   for( i = j.first(); i; i = j.next() ) incidences.append( i );
 
@@ -292,45 +294,45 @@ QPtrList<Incidence> Calendar::incidences()
 void Calendar::resetPilotStat(int id )
 {
- QPtrList<Incidence> incidences;
+ Q3PtrList<Incidence> incidences;
   
   Incidence *i;
 
-  QPtrList<Event> e = rawEvents();
+  Q3PtrList<Event> e = rawEvents();
   for( i = e.first(); i; i = e.next() ) i->setPilotId( id );
 
-  QPtrList<Todo> t = rawTodos();
+  Q3PtrList<Todo> t = rawTodos();
   for( i = t.first(); i; i = t.next() ) i->setPilotId( id );
 
-  QPtrList<Journal> j = journals();
+  Q3PtrList<Journal> j = journals();
   for( i = j.first(); i; i = j.next() ) i->setPilotId( id );
 }
 void Calendar::resetTempSyncStat()
 {
- QPtrList<Incidence> incidences;
+ Q3PtrList<Incidence> incidences;
   
   Incidence *i;
 
-  QPtrList<Event> e = rawEvents();
+  Q3PtrList<Event> e = rawEvents();
   for( i = e.first(); i; i = e.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
 
-  QPtrList<Todo> t = rawTodos();
+  Q3PtrList<Todo> t = rawTodos();
   for( i = t.first(); i; i = t.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
 
-  QPtrList<Journal> j = journals();
+  Q3PtrList<Journal> j = journals();
   for( i = j.first(); i; i = j.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
 }
-QPtrList<Incidence> Calendar::rawIncidences()
+Q3PtrList<Incidence> Calendar::rawIncidences()
 {
-  QPtrList<Incidence> incidences;
+  Q3PtrList<Incidence> incidences;
   
   Incidence *i;
 
-  QPtrList<Event> e = rawEvents();
+  Q3PtrList<Event> e = rawEvents();
   for( i = e.first(); i; i = e.next() ) incidences.append( i );
 
-  QPtrList<Todo> t = rawTodos();
+  Q3PtrList<Todo> t = rawTodos();
   for( i = t.first(); i; i = t.next() ) incidences.append( i );
 
-  QPtrList<Journal> j = journals();
+  Q3PtrList<Journal> j = journals();
   for( i = j.first(); i; i = j.next() ) incidences.append( i );
 
@@ -338,29 +340,29 @@ QPtrList<Incidence> Calendar::rawIncidences()
 }
 
-QPtrList<Event> Calendar::events( const QDate &date, bool sorted )
+Q3PtrList<Event> Calendar::events( const QDate &date, bool sorted )
 {
-  QPtrList<Event> el = rawEventsForDate(date,sorted);
+  Q3PtrList<Event> el = rawEventsForDate(date,sorted);
   mFilter->apply(&el);
   return el;
 }
 
-QPtrList<Event> Calendar::events( const QDateTime &qdt )
+Q3PtrList<Event> Calendar::events( const QDateTime &qdt )
 {
-  QPtrList<Event> el = rawEventsForDate(qdt);
+  Q3PtrList<Event> el = rawEventsForDate(qdt);
   mFilter->apply(&el);
   return el;
 }
 
-QPtrList<Event> Calendar::events( const QDate &start, const QDate &end,
+Q3PtrList<Event> Calendar::events( const QDate &start, const QDate &end,
                                   bool inclusive)
 {
-  QPtrList<Event> el = rawEvents(start,end,inclusive);
+  Q3PtrList<Event> el = rawEvents(start,end,inclusive);
   mFilter->apply(&el);
   return el;
 }
 
-QPtrList<Event> Calendar::events()
+Q3PtrList<Event> Calendar::events()
 {
-  QPtrList<Event> el = rawEvents();
+  Q3PtrList<Event> el = rawEvents();
   mFilter->apply(&el);
   return el;
@@ -370,5 +372,5 @@ void Calendar::addIncidenceBranch(Incidence *i)
     addIncidence( i );
     Incidence * inc;
-    QPtrList<Incidence> Relations = i->relations();
+    Q3PtrList<Incidence> Relations = i->relations();
     for (inc=Relations.first();inc;inc=Relations.next()) {
        addIncidenceBranch( inc );
@@ -408,7 +410,7 @@ Incidence* Calendar::incidence( const QString& uid )
 }
 
-QPtrList<Todo> Calendar::todos()
+Q3PtrList<Todo> Calendar::todos()
 {
-  QPtrList<Todo> tl = rawTodos();
+  Q3PtrList<Todo> tl = rawTodos();
   mFilter->apply( &tl );
   return tl;
@@ -456,5 +458,5 @@ void Calendar::removeRelations( Incidence *incidence )
     QString uid = incidence->uid();
 
-    QPtrList<Incidence> relations = incidence->relations();
+    Q3PtrList<Incidence> relations = incidence->relations();
     for( Incidence* i = relations.first(); i; i = relations.next() )
         if( !mOrphanUids.find( i->uid() ) ) {
@@ -472,5 +474,5 @@ void Calendar::removeRelations( Incidence *incidence )
     if( mOrphanUids.remove( uid ) ) {
         QString r2uid = incidence->relatedToUid();
-        QPtrList<Incidence> tempList;
+        Q3PtrList<Incidence> tempList;
         while( Incidence* i = mOrphans[ r2uid ] ) {
             mOrphans.remove( r2uid );
@@ -488,5 +490,5 @@ void Calendar::removeRelations( Incidence *incidence )
         if( !( incidence->relatedTo() != 0 && mOrphans.remove( incidence->relatedTo()->uid() ) ) ) {
             // Removing wasn't that easy
-            for( QDictIterator<Incidence> it( mOrphans ); it.current(); ++it ) {
+            for( Q3DictIterator<Incidence> it( mOrphans ); it.current(); ++it ) {
                 if( it.current()->uid() == uid ) {
                     mOrphans.remove( it.currentKey() );
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index fbc40ad..5845f44 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -26,6 +26,6 @@
 #include <qstring.h>
 #include <qdatetime.h>
-#include <qptrlist.h>
-#include <qdict.h>
+#include <q3ptrlist.h>
+#include <q3dict.h>
 
 #include "customproperties.h"
@@ -89,5 +89,5 @@ public:
     */
     virtual void save() = 0;
-    virtual QPtrList<Event> getExternLastSyncEvents() = 0;
+    virtual Q3PtrList<Event> getExternLastSyncEvents() = 0;
     virtual void removeSyncInfo( QString syncProfile) = 0; 
     virtual bool isSaving() { return false; }
@@ -156,10 +156,10 @@ public:
       Return filtered list of all incidences of this calendar.
     */
-    virtual QPtrList<Incidence> incidences();
+    virtual Q3PtrList<Incidence> incidences();
 
     /**
       Return unfiltered list of all incidences of this calendar.
     */
-    virtual QPtrList<Incidence> rawIncidences();
+    virtual Q3PtrList<Incidence> rawIncidences();
 
     /**
@@ -186,10 +186,10 @@ public:
       The calendar filter is applied.
     */
-    QPtrList<Event> events( const QDate &date, bool sorted = false);
+    Q3PtrList<Event> events( const QDate &date, bool sorted = false);
     /**
       Get events, which occur on the given date.
       The calendar filter is applied.
     */
-    QPtrList<Event> events( const QDateTime &qdt );
+    Q3PtrList<Event> events( const QDateTime &qdt );
     /**
       Get events in a range of dates. If inclusive is set to true, only events
@@ -197,14 +197,14 @@ public:
       The calendar filter is applied.
     */
-    QPtrList<Event> events( const QDate &start, const QDate &end,
+    Q3PtrList<Event> events( const QDate &start, const QDate &end,
                             bool inclusive = false);
     /**
       Return filtered list of all events in calendar.
     */
-    virtual QPtrList<Event> events();
+    virtual Q3PtrList<Event> events();
     /**
       Return unfiltered list of all events in calendar.
     */
-    virtual QPtrList<Event> rawEvents() = 0;
+    virtual Q3PtrList<Event> rawEvents() = 0;
 
     /**
@@ -223,5 +223,5 @@ public:
       Return filterd list of todos.
     */
-    virtual QPtrList<Todo> todos();
+    virtual Q3PtrList<Todo> todos();
     /**
       Searches todolist for an event with this unique string identifier,
@@ -233,9 +233,9 @@ public:
       Returns list of todos due on the specified date.
     */
-    virtual QPtrList<Todo> todos( const QDate &date ) = 0;
+    virtual Q3PtrList<Todo> todos( const QDate &date ) = 0;
     /**
       Return unfiltered list of todos.
     */
-    virtual QPtrList<Todo> rawTodos() = 0;
+    virtual Q3PtrList<Todo> rawTodos() = 0;
 
     /**
@@ -249,5 +249,5 @@ public:
     */
     virtual Journal *journal( const QDate & ) = 0;
-    virtual  QPtrList<Journal> journals4Date( const QDate & ) = 0;
+    virtual  Q3PtrList<Journal> journals4Date( const QDate & ) = 0;
     /**
       Return Journal with given UID.
@@ -257,5 +257,5 @@ public:
       Return list of all Journal entries.
     */
-    virtual QPtrList<Journal> journals() = 0;
+    virtual Q3PtrList<Journal> journals() = 0;
 
     /**
@@ -336,9 +336,9 @@ public:
       Get unfiltered events, which occur on the given date.
     */
-    virtual QPtrList<Event> rawEventsForDate( const QDateTime &qdt ) = 0;
+    virtual Q3PtrList<Event> rawEventsForDate( const QDateTime &qdt ) = 0;
     /**
       Get unfiltered events, which occur on the given date.
     */
-    virtual QPtrList<Event> rawEventsForDate( const QDate &date,
+    virtual Q3PtrList<Event> rawEventsForDate( const QDate &date,
                                               bool sorted = false ) = 0;  
     /**
@@ -346,5 +346,5 @@ public:
       are returned, which are completely included in the range.
     */
-    virtual QPtrList<Event> rawEvents( const QDate &start, const QDate &end,
+    virtual Q3PtrList<Event> rawEvents( const QDate &start, const QDate &end,
                                        bool inclusive = false ) = 0; 
 
@@ -377,6 +377,6 @@ private:
 
     // This list is used to put together related todos
-    QDict<Incidence> mOrphans;
-    QDict<Incidence> mOrphanUids;
+    Q3Dict<Incidence> mOrphans;
+    Q3Dict<Incidence> mOrphanUids;
 };
   
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index ce3cd09..cb52b7c 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -23,5 +23,5 @@
 #include <qdatetime.h>
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include <kdebug.h>
@@ -193,5 +193,5 @@ bool CalendarLocal::mergeCalendar( Calendar* remote  )
     //   if inc in local, replace it
     //   if not in local, add it to default calendar
-    QPtrList<Incidence> localInc = rawIncidences(); 
+    Q3PtrList<Incidence> localInc = rawIncidences(); 
     Incidence* inL = localInc.first(); 
     while ( inL ) {
@@ -201,5 +201,5 @@ bool CalendarLocal::mergeCalendar( Calendar* remote  )
         inL = localInc.next();
     }
-    QPtrList<Incidence> er = remote->rawIncidences(); 
+    Q3PtrList<Incidence> er = remote->rawIncidences(); 
     Incidence* inR = er.first();
     while ( inR ) {
@@ -260,7 +260,7 @@ void CalendarLocal::addCalendar( Calendar* cal )
     cal->setDontDeleteIncidencesOnClose();
     setSyncEventsEnabled();
-    QPtrList<Incidence> incList;
+    Q3PtrList<Incidence> incList;
     {
-        QPtrList<Event> EventList = cal->rawEvents();
+        Q3PtrList<Event> EventList = cal->rawEvents();
         Event * ev = EventList.first();
         while ( ev ) {
@@ -280,5 +280,5 @@ void CalendarLocal::addCalendar( Calendar* cal )
     {
 
-        QPtrList<Todo> TodoList = cal->rawTodos();
+        Q3PtrList<Todo> TodoList = cal->rawTodos();
         Todo * ev = TodoList.first();
         while ( ev ) {
@@ -300,5 +300,5 @@ void CalendarLocal::addCalendar( Calendar* cal )
     }
     {
-        QPtrList<Journal> JournalList = cal->journals();
+        Q3PtrList<Journal> JournalList = cal->journals();
         Journal * ev = JournalList.first();
         while ( ev ) {
@@ -482,7 +482,7 @@ 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() )
         if ( it->calEnabled() ) el.append( it );
@@ -500,5 +500,5 @@ Todo *CalendarLocal::todo( QString syncProf, QString id )
 void CalendarLocal::removeSyncInfo( QString syncProfile)
 {
-    QPtrList<Incidence> all = rawIncidences() ;
+    Q3PtrList<Incidence> all = rawIncidences() ;
     Incidence *inc;
     for ( inc = all.first(); inc; inc = all.next() ) {
@@ -506,5 +506,5 @@ void CalendarLocal::removeSyncInfo( QString syncProfile)
     }
     if ( syncProfile.isEmpty() ) {
-        QPtrList<Event> el;
+        Q3PtrList<Event> el;
         Event *todo;
         for ( todo = mEventList.first(); todo; todo = mEventList.next() ) {
@@ -521,7 +521,7 @@ void CalendarLocal::removeSyncInfo( QString syncProfile)
     }
 }
-QPtrList<Event> CalendarLocal::getExternLastSyncEvents()
+Q3PtrList<Event> CalendarLocal::getExternLastSyncEvents()
 {
-    QPtrList<Event> el;
+    Q3PtrList<Event> el;
     Event *todo;
     for ( todo = mEventList.first(); todo; todo = mEventList.next() ) {
@@ -686,7 +686,7 @@ void CalendarLocal::deRegisterAlarm()
 }
 
-QPtrList<Todo> CalendarLocal::todos( const QDate &date )
+Q3PtrList<Todo> CalendarLocal::todos( const QDate &date )
 {
-  QPtrList<Todo> todos;
+  Q3PtrList<Todo> todos;
 
   Todo *todo;
@@ -787,5 +787,5 @@ void CalendarLocal::appendAlarms( Alarm::List &alarms, Incidence *incidence,
                                   const QDateTime &from, const QDateTime &to )
 {
-  QPtrList<Alarm> alarmList = incidence->alarms();
+  Q3PtrList<Alarm> alarmList = incidence->alarms();
   Alarm *alarm;
   for( alarm = alarmList.first(); alarm; alarm = alarmList.next() ) {
@@ -806,5 +806,5 @@ void CalendarLocal::appendRecurringAlarms( Alarm::List &alarms,
 {
  
-  QPtrList<Alarm> alarmList = incidence->alarms();
+  Q3PtrList<Alarm> alarmList = incidence->alarms();
   Alarm *alarm;
   QDateTime qdt;
@@ -845,7 +845,7 @@ 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;
 
   Event *event;
@@ -879,5 +879,5 @@ QPtrList<Event> CalendarLocal::rawEventsForDate( const QDate &qd, bool sorted )
   //  kdDebug(5800) << "Sorting events for date\n" << endl;
   // now, we have to sort it based on dtStart.time()
-  QPtrList<Event> eventListSorted;
+  Q3PtrList<Event> eventListSorted;
   Event *sortEvent;
   for ( event = eventList.first(); event; event = eventList.next() ) {
@@ -895,10 +895,10 @@ 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 )
 {
   Event *event = 0;
 
-  QPtrList<Event> eventList;
+  Q3PtrList<Event> eventList;
 
   // Get non-recurring events
@@ -924,5 +924,5 @@ QPtrList<Event> CalendarLocal::rawEvents( const QDate &start, const QDate &end,
       } else {
           bool founOne;
-          QDate next = event->getNextOccurence( start, &founOne ).date();
+          QDate next = event->getNextOccurence( (QDateTime)start, &founOne ).date();
           if ( founOne ) {
               if ( next <= end ) {
@@ -973,12 +973,12 @@ QPtrList<Event> CalendarLocal::rawEvents( const QDate &start, const QDate &end,
 }
 
-QPtrList<Event> CalendarLocal::rawEventsForDate( const QDateTime &qdt )
+Q3PtrList<Event> CalendarLocal::rawEventsForDate( const QDateTime &qdt )
 {
   return rawEventsForDate( qdt.date() );
 }
 
-QPtrList<Event> CalendarLocal::rawEvents()
+Q3PtrList<Event> CalendarLocal::rawEvents()
 {
-    QPtrList<Event> el;
+    Q3PtrList<Event> el;
     for ( Event *it = mEventList.first(); it; it = mEventList.next() )
         if ( it->calEnabled() ) el.append( it );
@@ -1007,7 +1007,7 @@ 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() )
         if ( it->calEnabled() && it->dtStart().date() == date) el.append( it );
@@ -1041,7 +1041,7 @@ 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() )
         if ( it->calEnabled() ) el.append( it );
@@ -1052,5 +1052,5 @@ void CalendarLocal::setCalendarRemove( int id )
    
     {
-        QPtrList<Event> EventList = mEventList;
+        Q3PtrList<Event> EventList = mEventList;
         Event * ev = EventList.first();
         while ( ev ) {
@@ -1062,5 +1062,5 @@ void CalendarLocal::setCalendarRemove( int id )
     {
 
-        QPtrList<Todo> TodoList = mTodoList;
+        Q3PtrList<Todo> TodoList = mTodoList;
         Todo * ev = TodoList.first();
         while ( ev ) {
@@ -1071,5 +1071,5 @@ void CalendarLocal::setCalendarRemove( int id )
     }
     {
-        QPtrList<Journal> JournalList = mJournalList;
+        Q3PtrList<Journal> JournalList = mJournalList;
         Journal * ev = JournalList.first();
         while ( ev ) {
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h
index 1ceabce..1df65c7 100644
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@@ -24,4 +24,6 @@
 
 #include "calendar.h"
+//Added by qt3to4:
+#include <Q3PtrList>
 
 namespace KCal {
@@ -94,6 +96,6 @@ class CalendarLocal : public Calendar
       Return unfiltered list of all events in calendar.
     */
-    QPtrList<Event> rawEvents();
-    QPtrList<Event> getExternLastSyncEvents();
+    Q3PtrList<Event> rawEvents();
+    Q3PtrList<Event> getExternLastSyncEvents();
     /**
       Add a todo to the todolist.
@@ -113,9 +115,9 @@ class CalendarLocal : public Calendar
       Return list of all todos.
     */
-    QPtrList<Todo> rawTodos();
+    Q3PtrList<Todo> rawTodos();
     /**
       Returns list of todos due on the specified date.
     */
-    QPtrList<Todo> todos( const QDate &date );
+    Q3PtrList<Todo> todos( const QDate &date );
     /**
       Return list of all todos.
@@ -123,5 +125,5 @@ class CalendarLocal : public Calendar
       Workaround because compiler does not recognize function of base class.
     */
-    QPtrList<Todo> todos() { return Calendar::todos(); }
+    Q3PtrList<Todo> todos() { return Calendar::todos(); }
 
     /**
@@ -137,5 +139,5 @@ class CalendarLocal : public Calendar
     */
     Journal *journal( const QDate & );
-    QPtrList<Journal> journals4Date( const QDate & );
+    Q3PtrList<Journal> journals4Date( const QDate & );
     /**
       Return Journal with given UID.
@@ -145,5 +147,5 @@ class CalendarLocal : public Calendar
       Return list of all Journals stored in calendar.
     */
-    QPtrList<Journal> journals();
+    Q3PtrList<Journal> journals();
 
     /**
@@ -175,14 +177,14 @@ class CalendarLocal : public Calendar
       date specified. useful for dayView, etc. etc.
     */
-    QPtrList<Event> rawEventsForDate( const QDate &date, bool sorted = false );
+    Q3PtrList<Event> rawEventsForDate( const QDate &date, bool sorted = false );
     /**
       Get unfiltered events for date \a qdt.
     */
-    QPtrList<Event> rawEventsForDate( const QDateTime &qdt );
+    Q3PtrList<Event> rawEventsForDate( const QDateTime &qdt );
     /**
       Get unfiltered events in a range of dates. If inclusive is set to true,
       only events are returned, which are completely included in the range.
     */
-    QPtrList<Event> rawEvents( const QDate &start, const QDate &end,
+    Q3PtrList<Event> rawEvents( const QDate &start, const QDate &end,
                                bool inclusive = false );
     Todo *todo( QString, QString );
@@ -225,7 +227,7 @@ public slots:
     void init();
 
-    QPtrList<Event> mEventList;
-    QPtrList<Todo> mTodoList;
-    QPtrList<Journal> mJournalList;
+    Q3PtrList<Event> mEventList;
+    Q3PtrList<Todo> mTodoList;
+    Q3PtrList<Journal> mJournalList;
 };
 
diff --git a/libkcal/calfilter.cpp b/libkcal/calfilter.cpp
index 72f70c2..fa1dbd5 100644
--- a/libkcal/calfilter.cpp
+++ b/libkcal/calfilter.cpp
@@ -22,4 +22,6 @@
 
 #include "calfilter.h"
+//Added by qt3to4:
+#include <Q3PtrList>
 
 using namespace KCal;
@@ -42,5 +44,5 @@ CalFilter::~CalFilter()
 }
 
-void CalFilter::apply(QPtrList<Event> *eventlist)
+void CalFilter::apply(Q3PtrList<Event> *eventlist)
 {
   if (!mEnabled) return;
@@ -62,5 +64,5 @@ void CalFilter::apply(QPtrList<Event> *eventlist)
 
 // TODO: avoid duplicating apply() code
-void CalFilter::apply(QPtrList<Todo> *eventlist)
+void CalFilter::apply(Q3PtrList<Todo> *eventlist)
 {
   if (!mEnabled) return;
diff --git a/libkcal/calfilter.h b/libkcal/calfilter.h
index e349770..821149f 100644
--- a/libkcal/calfilter.h
+++ b/libkcal/calfilter.h
@@ -23,5 +23,5 @@
 
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include "event.h"
@@ -56,5 +56,5 @@ class CalFilter {
       removed from the list.
     */
-    void apply(QPtrList<Event> *eventlist);
+    void apply(Q3PtrList<Event> *eventlist);
     
     /**
@@ -62,7 +62,7 @@ class CalFilter {
       removed from the list.
     */
-    void apply(QPtrList<Todo> *todolist);
-    bool CalFilter::filterCalendarItem(Incidence *in);
-    bool CalFilter::filterJournal(Journal *in);
+    void apply(Q3PtrList<Todo> *todolist);
+    bool filterCalendarItem(Incidence *in);
+    bool filterJournal(Journal *in);
     /**
       Apply filter criteria on the specified event. Return true, if event passes
diff --git a/libkcal/customproperties.cpp b/libkcal/customproperties.cpp
index adc1710..16f4a28 100644
--- a/libkcal/customproperties.cpp
+++ b/libkcal/customproperties.cpp
@@ -20,4 +20,6 @@
 
 #include "customproperties.h"
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace KCal;
@@ -36,10 +38,10 @@ CustomProperties::~CustomProperties()
 }
 
-void CustomProperties::setCustomProperty(const QCString &app, const QCString &key,
+void CustomProperties::setCustomProperty(const Q3CString &app, const Q3CString &key,
                                          const QString &value)
 {
   if (value.isNull() || key.isEmpty() || app.isEmpty())
     return;
-  QCString property = "X-KDE-" + app + "-" + key;
+  Q3CString property = "X-KDE-" + app + "-" + key;
   if (!checkName(property))
     return;
@@ -47,15 +49,15 @@ void CustomProperties::setCustomProperty(const QCString &app, const QCString &ke
 }
 
-void CustomProperties::removeCustomProperty(const QCString &app, const QCString &key)
+void CustomProperties::removeCustomProperty(const Q3CString &app, const Q3CString &key)
 {
-  removeNonKDECustomProperty(QCString("X-KDE-" + app + "-" + key));
+  removeNonKDECustomProperty(Q3CString("X-KDE-" + app + "-" + key));
 }
 
-QString CustomProperties::customProperty(const QCString &app, const QCString &key) const
+QString CustomProperties::customProperty(const Q3CString &app, const Q3CString &key) const
 {
-  return nonKDECustomProperty(QCString("X-KDE-" + app + "-" + key));
+  return nonKDECustomProperty(Q3CString("X-KDE-" + app + "-" + key));
 }
 
-void CustomProperties::setNonKDECustomProperty(const QCString &name, const QString &value)
+void CustomProperties::setNonKDECustomProperty(const Q3CString &name, const QString &value)
 {
   if (value.isNull() || !checkName(name))
@@ -64,14 +66,14 @@ void CustomProperties::setNonKDECustomProperty(const QCString &name, const QStri
 }
 
-void CustomProperties::removeNonKDECustomProperty(const QCString &name)
+void CustomProperties::removeNonKDECustomProperty(const Q3CString &name)
 {
-  QMap<QCString, QString>::Iterator it = mProperties.find(name);
+  QMap<Q3CString, QString>::Iterator it = mProperties.find(name);
   if (it != mProperties.end())
     mProperties.remove(it);
 }
 
-QString CustomProperties::nonKDECustomProperty(const QCString &name) const
+QString CustomProperties::nonKDECustomProperty(const Q3CString &name) const
 {
-  QMap<QCString, QString>::ConstIterator it = mProperties.find(name);
+  QMap<Q3CString, QString>::ConstIterator it = mProperties.find(name);
   if (it == mProperties.end())
     return QString::null;
@@ -79,7 +81,7 @@ QString CustomProperties::nonKDECustomProperty(const QCString &name) const
 }
 
-void CustomProperties::setCustomProperties(const QMap<QCString, QString> &properties)
+void CustomProperties::setCustomProperties(const QMap<Q3CString, QString> &properties)
 {
-  for (QMap<QCString, QString>::ConstIterator it = properties.begin();  it != properties.end();  ++it) {
+  for (QMap<Q3CString, QString>::ConstIterator it = properties.begin();  it != properties.end();  ++it) {
     // Validate the property name and convert any null string to empty string
     if (checkName(it.key())) {
@@ -89,10 +91,10 @@ void CustomProperties::setCustomProperties(const QMap<QCString, QString> &proper
 }
 
-QMap<QCString, QString> CustomProperties::customProperties() const
+QMap<Q3CString, QString> CustomProperties::customProperties() const
 {
   return mProperties;
 }
 
-bool CustomProperties::checkName(const QCString &name)
+bool CustomProperties::checkName(const Q3CString &name)
 {
   // Check that the property name starts with 'X-' and contains
diff --git a/libkcal/customproperties.h b/libkcal/customproperties.h
index 0cbfdcd..75eb3ad 100644
--- a/libkcal/customproperties.h
+++ b/libkcal/customproperties.h
@@ -24,4 +24,6 @@
 #include <qstring.h>
 #include <qmap.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 namespace KCal {
@@ -50,5 +52,5 @@ class CustomProperties
       will be ignored.
      */
-    void setCustomProperty(const QCString &app, const QCString &key,
+    void setCustomProperty(const Q3CString &app, const Q3CString &key,
                            const QString &value);
     /** Delete a custom calendar property.
@@ -56,5 +58,5 @@ class CustomProperties
       @param key Property identifier specific to the application.
      */
-    void removeCustomProperty(const QCString &app, const QCString &key);
+    void removeCustomProperty(const Q3CString &app, const Q3CString &key);
     /** Return the value of a custom calendar property.
       @param app Application name as it appears in the custom property name.
@@ -62,5 +64,5 @@ class CustomProperties
       @return Property value, or QString::null if (and only if) the property does not exist.
      */
-    QString customProperty(const QCString &app, const QCString &key) const;
+    QString customProperty(const Q3CString &app, const Q3CString &key) const;
 
     /** Create or modify a non-KDE or non-standard custom calendar property.
@@ -69,26 +71,26 @@ class CustomProperties
       will be ignored.
      */
-    void setNonKDECustomProperty(const QCString &name, const QString &value);
+    void setNonKDECustomProperty(const Q3CString &name, const QString &value);
     /** Delete a non-KDE or non-standard custom calendar property.
       @param name Full property name
      */
-    void removeNonKDECustomProperty(const QCString &name);
+    void removeNonKDECustomProperty(const Q3CString &name);
     /** Return the value of a non-KDE or non-standard custom calendar property.
       @param name Full property name
       @return Property value, or QString::null if (and only if) the property does not exist.
      */
-    QString nonKDECustomProperty(const QCString& name) const;
+    QString nonKDECustomProperty(const Q3CString& name) const;
 
     /** Initialise the alarm's custom calendar properties to the specified
         key/value pairs.
      */
-    void setCustomProperties(const QMap<QCString, QString> &properties);
+    void setCustomProperties(const QMap<Q3CString, QString> &properties);
     /** Return all custom calendar property key/value pairs. */
-    QMap<QCString, QString> customProperties() const;
+    QMap<Q3CString, QString> customProperties() const;
 
   private:
-    static bool checkName(const QCString& name);
+    static bool checkName(const Q3CString& name);
 
-    QMap<QCString, QString> mProperties;   // custom calendar properties
+    QMap<Q3CString, QString> mProperties;   // custom calendar properties
 };
 
diff --git a/libkcal/dndfactory.cpp b/libkcal/dndfactory.cpp
index cdcfae4..ca7e212 100644
--- a/libkcal/dndfactory.cpp
+++ b/libkcal/dndfactory.cpp
@@ -23,4 +23,7 @@
 #include <qapplication.h>
 #include <qclipboard.h>
+//Added by qt3to4:
+#include <QDropEvent>
+#include <Q3PtrList>
 
 #include <kiconloader.h>
@@ -69,5 +72,5 @@ Event *DndFactory::createDrop(QDropEvent *de)
     de->accept();
 
-    QPtrList<Event> events = cal.events();
+    Q3PtrList<Event> events = cal.events();
     if ( !events.isEmpty() ) {
       Event *event = new Event( *events.first() );
@@ -88,5 +91,5 @@ Todo *DndFactory::createDropTodo(QDropEvent *de)
     de->accept();
 
-    QPtrList<Todo> todos = cal.todos();
+    Q3PtrList<Todo> todos = cal.todos();
     if ( !todos.isEmpty() ) {
       Todo *todo = new Todo( *todos.first() );
@@ -134,5 +137,5 @@ Incidence *DndFactory::pasteIncidence(const QDate &newDate, const QTime *newTime
   }
 
-  QPtrList<Incidence> incList = cal.incidences();
+  Q3PtrList<Incidence> incList = cal.incidences();
   Incidence *inc = incList.first();
 
diff --git a/libkcal/dndfactory.h b/libkcal/dndfactory.h
index 2df5259..a873c37 100644
--- a/libkcal/dndfactory.h
+++ b/libkcal/dndfactory.h
@@ -1,2 +1,4 @@
+//Added by qt3to4:
+#include <QDropEvent>
 /*
     This file is part of libkcal.
diff --git a/libkcal/dndfactory_dummy.h b/libkcal/dndfactory_dummy.h
index 44cc114..3ab6adf 100644
--- a/libkcal/dndfactory_dummy.h
+++ b/libkcal/dndfactory_dummy.h
@@ -26,4 +26,6 @@
 
 #include "vcalformat.h"
+//Added by qt3to4:
+#include <QDropEvent>
 
 class QDropEvent;
diff --git a/libkcal/dummyscheduler.cpp b/libkcal/dummyscheduler.cpp
index ae40e6d..73eb3d0 100644
--- a/libkcal/dummyscheduler.cpp
+++ b/libkcal/dummyscheduler.cpp
@@ -24,5 +24,7 @@
 
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 #include <kdebug.h>
@@ -69,6 +71,6 @@ bool DummyScheduler::saveMessage(const QString &message)
 {
   QFile f("dummyscheduler.store");
-  if (f.open(IO_WriteOnly | IO_Append)) {
-    QTextStream t(&f);
+  if (f.open(QIODevice::WriteOnly | QIODevice::Append)) {
+    Q3TextStream t(&f);
     t << message << endl;
     f.close();
@@ -79,14 +81,14 @@ bool DummyScheduler::saveMessage(const QString &message)
 }
 
-QPtrList<ScheduleMessage> DummyScheduler::retrieveTransactions()
+Q3PtrList<ScheduleMessage> DummyScheduler::retrieveTransactions()
 {
-  QPtrList<ScheduleMessage> messageList;
+  Q3PtrList<ScheduleMessage> messageList;
 
   QFile f("dummyscheduler.store");
-  if (!f.open(IO_ReadOnly)) {
+  if (!f.open(QIODevice::ReadOnly)) {
     kdDebug(5800) << "DummyScheduler::retrieveTransactions(): Can't open file"
               << endl;
   } else {
-    QTextStream t(&f);
+    Q3TextStream t(&f);
     QString messageString;
     QString messageLine = t.readLine();
diff --git a/libkcal/dummyscheduler.h b/libkcal/dummyscheduler.h
index df42153..f86d583 100644
--- a/libkcal/dummyscheduler.h
+++ b/libkcal/dummyscheduler.h
@@ -25,4 +25,6 @@
 
 #include "scheduler.h"
+//Added by qt3to4:
+#include <Q3PtrList>
 
 namespace KCal {
@@ -40,5 +42,5 @@ class DummyScheduler : public Scheduler {
     bool performTransaction(IncidenceBase *incidence,Method method);
     bool performTransaction(IncidenceBase *incidence,Method method,const QString &recipients);
-    QPtrList<ScheduleMessage> retrieveTransactions();
+    Q3PtrList<ScheduleMessage> retrieveTransactions();
 
   protected:
diff --git a/libkcal/event.cpp b/libkcal/event.cpp
index fdf5657..060df81 100644
--- a/libkcal/event.cpp
+++ b/libkcal/event.cpp
@@ -385,5 +385,5 @@ QDateTime Event::getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_
 //          return incidenceStart;
 //      }
-     for (QPtrListIterator<Alarm> it(mAlarms); (alarm = it.current()) != 0; ++it) {
+     for (Q3PtrListIterator<Alarm> it(mAlarms); (alarm = it.current()) != 0; ++it) {
          if (alarm->enabled()) {
              if ( alarm->hasTime () ) {
diff --git a/libkcal/event.h b/libkcal/event.h
index 6a58618..da44f81 100644
--- a/libkcal/event.h
+++ b/libkcal/event.h
@@ -26,4 +26,6 @@
 
 #include "incidence.h"
+//Added by qt3to4:
+#include <Q3CString>
 namespace KCal {
 
@@ -41,5 +43,5 @@ class Event : public Incidence
     bool matchTime(QDateTime*startDT, QDateTime* endDT);
 
-    QCString type() const { return "Event"; }
+    Q3CString type() const { return "Event"; }
     IncTypeID typeID() const { return eventID; }
 
diff --git a/libkcal/filestorage.cpp b/libkcal/filestorage.cpp
index a139124..3d1309f 100644
--- a/libkcal/filestorage.cpp
+++ b/libkcal/filestorage.cpp
@@ -23,5 +23,5 @@
 #include <qdatetime.h>
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include <kdebug.h>
diff --git a/libkcal/freebusy.cpp b/libkcal/freebusy.cpp
index ba15d6d..e4e9ec9 100644
--- a/libkcal/freebusy.cpp
+++ b/libkcal/freebusy.cpp
@@ -22,4 +22,7 @@
 
 #include "freebusy.h"
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3PtrList>
 
 using namespace KCal;
@@ -44,5 +47,5 @@ FreeBusy::FreeBusy( Calendar *calendar, const QDateTime &start, const QDateTime
 
   //Gets all the events in the calendar
-  QPtrList<Event> eventList = mCalendar->events();
+  Q3PtrList<Event> eventList = mCalendar->events();
   Event *event;
 
@@ -114,5 +117,5 @@ QDateTime FreeBusy::dtEnd() const
 }
 
-QValueList<Period> FreeBusy::busyPeriods() const
+Q3ValueList<Period> FreeBusy::busyPeriods() const
 {
   return mBusyPeriods;
@@ -147,5 +150,5 @@ bool FreeBusy::addLocalPeriod(const QDateTime &eventStart, const QDateTime &even
 }
 
-FreeBusy::FreeBusy(QValueList<Period> busyPeriods)
+FreeBusy::FreeBusy(Q3ValueList<Period> busyPeriods)
 {
   mBusyPeriods = busyPeriods;
@@ -154,5 +157,5 @@ FreeBusy::FreeBusy(QValueList<Period> busyPeriods)
 void FreeBusy::sortList()
 {
-  typedef QValueList<Period> PeriodList;
+  typedef Q3ValueList<Period> PeriodList;
 
   PeriodList::Iterator tmpPeriod, earlyPeriod;
diff --git a/libkcal/freebusy.h b/libkcal/freebusy.h
index d741c72..bd14cb7 100644
--- a/libkcal/freebusy.h
+++ b/libkcal/freebusy.h
@@ -25,6 +25,8 @@
 
 #include <qdatetime.h>
-#include <qvaluelist.h>
-#include <qptrlist.h>
+#include <q3valuelist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include "period.h"
@@ -44,9 +46,9 @@ class FreeBusy : public IncidenceBase
     FreeBusy(const QDateTime &start, const QDateTime &end);
     FreeBusy(Calendar *calendar, const QDateTime &start, const QDateTime &end);
-    FreeBusy(QValueList<Period> busyPeriods);
+    FreeBusy(Q3ValueList<Period> busyPeriods);
 
     ~FreeBusy();
     
-    QCString type() const { return "FreeBusy"; }
+    Q3CString type() const { return "FreeBusy"; }
     IncTypeID typeID() const { return freebusyID; }
 
@@ -54,5 +56,5 @@ class FreeBusy : public IncidenceBase
     bool setDtEnd( const QDateTime &end );
 
-    QValueList<Period> busyPeriods() const;
+    Q3ValueList<Period> busyPeriods() const;
 
     void addPeriod(const QDateTime &start, const QDateTime &end);
@@ -65,5 +67,5 @@ class FreeBusy : public IncidenceBase
 
     QDateTime mDtEnd;
-    QValueList<Period> mBusyPeriods;
+    Q3ValueList<Period> mBusyPeriods;
     Calendar *mCalendar;
 };
diff --git a/libkcal/icaldrag.cpp b/libkcal/icaldrag.cpp
index 446a115..7f5a796 100644
--- a/libkcal/icaldrag.cpp
+++ b/libkcal/icaldrag.cpp
@@ -29,5 +29,5 @@ using namespace KCal;
 
 ICalDrag::ICalDrag( Calendar *cal, QWidget *parent, const char *name )
-  : QStoredDrag( "text/calendar", parent, name )
+  : Q3StoredDrag( "text/calendar", parent, name )
 {
   ICalFormat icf;
diff --git a/libkcal/icaldrag.h b/libkcal/icaldrag.h
index fdf32b7..c1f73f4 100644
--- a/libkcal/icaldrag.h
+++ b/libkcal/icaldrag.h
@@ -23,5 +23,5 @@
 #define ICALDRAG_H
 
-#include <qdragobject.h>
+#include <q3dragobject.h>
 #include "calendar.h"
 
@@ -29,5 +29,5 @@ namespace KCal {
 
 /** iCalendar drag&drop class. */
-class ICalDrag : public QStoredDrag
+class ICalDrag : public Q3StoredDrag
 {
   public:
diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp
index 6f3a799..3829bc1 100644
--- a/libkcal/icalformat.cpp
+++ b/libkcal/icalformat.cpp
@@ -21,9 +21,9 @@
 #include <qdatetime.h>
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qregexp.h>
 #include <qclipboard.h>
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
 #include <stdlib.h>
@@ -71,12 +71,12 @@ bool ICalFormat::load( Calendar *calendar, const QString &fileName)
 
   QFile file( fileName );  
-  if (!file.open( IO_ReadOnly ) ) {
+  if (!file.open( QIODevice::ReadOnly ) ) {
     setException(new ErrorFormat(ErrorFormat::LoadError));
     return false;
   } 
-  QTextStream ts( &file );
+  Q3TextStream ts( &file );
   QString text; 
 
-  ts.setEncoding( QTextStream::Latin1 );
+  ts.setEncoding( Q3TextStream::Latin1 );
   text = ts.read(); 
   file.close();
@@ -99,12 +99,12 @@ bool ICalFormat::save( Calendar *calendar, const QString &fileName )
   //is.restart();
   QFile file( fileName );
-  if (!file.open( IO_WriteOnly ) ) {
+  if (!file.open( QIODevice::WriteOnly ) ) {
     setException(new ErrorFormat(ErrorFormat::SaveError,
                  i18n("Could not open file '%1'").arg(fileName)));
     return false;
   }
-  QTextStream ts( &file );
+  Q3TextStream ts( &file );
 
-  ts.setEncoding( QTextStream::Latin1 );
+  ts.setEncoding( Q3TextStream::Latin1 );
   ts << text;
   file.close();
@@ -157,13 +157,13 @@ Incidence *ICalFormat::fromString( const QString &text )
   
   Incidence *ical = 0;
-  QPtrList<Event> elist = cal.events();
+  Q3PtrList<Event> elist = cal.events();
   if ( elist.count() > 0 ) {
     ical = elist.first();
   } else {
-    QPtrList<Todo> tlist = cal.todos();
+    Q3PtrList<Todo> tlist = cal.todos();
     if ( tlist.count() > 0 ) {
       ical = tlist.first();
     } else {
-      QPtrList<Journal> jlist = cal.journals();
+      Q3PtrList<Journal> jlist = cal.journals();
       if ( jlist.count() > 0 ) {
         ical = jlist.first();
@@ -173,5 +173,5 @@ Incidence *ICalFormat::fromString( const QString &text )
   return ical;
 }
-#include <qapp.h>
+#include <qapplication.h>
 
 QString ICalFormat::toString( Calendar *cal )
@@ -185,6 +185,6 @@ QString ICalFormat::toString( Calendar *cal )
  
   // todos 
-  QPtrList<Todo> todoList = cal->rawTodos();
-  QPtrListIterator<Todo> qlt(todoList);
+  Q3PtrList<Todo> todoList = cal->rawTodos();
+  Q3PtrListIterator<Todo> qlt(todoList);
   for (; qlt.current(); ++qlt) {
     component = mImpl->writeTodo(qlt.current());
@@ -197,5 +197,5 @@ QString ICalFormat::toString( Calendar *cal )
   }
   // events
-  QPtrList<Event> events = cal->rawEvents();
+  Q3PtrList<Event> events = cal->rawEvents();
   Event *ev;
   for(ev=events.first();ev;ev=events.next()) {
@@ -208,5 +208,5 @@ QString ICalFormat::toString( Calendar *cal )
  
   // journals
-  QPtrList<Journal> journals = cal->journals();
+  Q3PtrList<Journal> journals = cal->journals();
   Journal *j;
   for(j=journals.first();j;j=journals.next()) {
diff --git a/libkcal/icalformat.h b/libkcal/icalformat.h
index a770dbb..a454b35 100644
--- a/libkcal/icalformat.h
+++ b/libkcal/icalformat.h
@@ -22,4 +22,6 @@
 
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include "scheduler.h"
@@ -107,5 +109,5 @@ class ICalFormat : public CalFormat {
     ICalFormatImpl *mImpl;
     QString mTimeZoneId;
-    QCString mTzString;
+    Q3CString mTzString;
     int tzOffsetMin;
     bool mUtc;
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index 65eabc8..ea144ee 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -21,6 +21,9 @@
 #include <qdatetime.h>
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qfile.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3CString>
 
 #include <kdebug.h>
@@ -222,6 +225,6 @@ icalcomponent *ICalFormatImpl::writeFreeBusy(FreeBusy *freebusy,
 
   //Loops through all the periods in the freebusy object
-  QValueList<Period> list = freebusy->busyPeriods();
-  QValueList<Period>::Iterator it;
+  Q3ValueList<Period> list = freebusy->busyPeriods();
+  Q3ValueList<Period>::Iterator it;
   icalperiodtype period;
   for (it = list.begin(); it!= list.end(); ++it) {
@@ -385,10 +388,10 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence)
   
   // attachments
-  QPtrList<Attachment> attachments = incidence->attachments();
+  Q3PtrList<Attachment> attachments = incidence->attachments();
   for (Attachment *at = attachments.first(); at; at = attachments.next())
     icalcomponent_add_property(parent,writeAttachment(at));
 
   // alarms
-  QPtrList<Alarm> alarms = incidence->alarms();
+  Q3PtrList<Alarm> alarms = incidence->alarms();
   Alarm* alarm;
   for (alarm = alarms.first(); alarm; alarm = alarms.next()) {
@@ -424,6 +427,6 @@ void ICalFormatImpl::writeIncidenceBase(icalcomponent *parent,IncidenceBase *inc
   // attendees
   if (incidenceBase->attendeeCount() != 0) {
-    QPtrList<Attendee> al = incidenceBase->attendees();
-    QPtrListIterator<Attendee> ai(al);
+    Q3PtrList<Attendee> al = incidenceBase->attendees();
+    Q3PtrListIterator<Attendee> ai(al);
     for (; ai.current(); ++ai) {
       icalcomponent_add_property(parent,writeAttendee(ai.current()));
@@ -437,6 +440,6 @@ void ICalFormatImpl::writeIncidenceBase(icalcomponent *parent,IncidenceBase *inc
 void ICalFormatImpl::writeCustomProperties(icalcomponent *parent,CustomProperties *properties)
 {
-  QMap<QCString, QString> custom = properties->customProperties();
-  for (QMap<QCString, QString>::Iterator c = custom.begin();  c != custom.end();  ++c) {
+  QMap<Q3CString, QString> custom = properties->customProperties();
+  for (QMap<Q3CString, QString>::Iterator c = custom.begin();  c != custom.end();  ++c) {
     icalproperty *p = icalproperty_new_x(c.data().utf8());
     icalproperty_set_x_name(p,c.key());
@@ -547,6 +550,6 @@ icalproperty *ICalFormatImpl::writeRecurrenceRule(Recurrence *recur)
   int index2 = 0;
 
-  QPtrList<Recurrence::rMonthPos> tmpPositions;
-  QPtrList<int> tmpDays;
+  Q3PtrList<Recurrence::rMonthPos> tmpPositions;
+  Q3PtrList<int> tmpDays;
   int *tmpDay;
   Recurrence::rMonthPos *tmpPos;
@@ -705,6 +708,6 @@ icalcomponent *ICalFormatImpl::writeAlarm(Alarm *alarm)
     case Alarm::Email: {
       action = ICAL_ACTION_EMAIL;
-      QValueList<Person> addresses = alarm->mailAddresses();
-      for (QValueList<Person>::Iterator ad = addresses.begin();  ad != addresses.end();  ++ad) {
+      Q3ValueList<Person> addresses = alarm->mailAddresses();
+      for (Q3ValueList<Person>::Iterator ad = addresses.begin();  ad != addresses.end();  ++ad) {
         icalproperty *p = icalproperty_new_attendee("MAILTO:" + (*ad).email().utf8());
         if (!(*ad).name().isEmpty()) {
@@ -764,6 +767,6 @@ icalcomponent *ICalFormatImpl::writeAlarm(Alarm *alarm)
 
   // Custom properties
-  QMap<QCString, QString> custom = alarm->customProperties();
-  for (QMap<QCString, QString>::Iterator c = custom.begin();  c != custom.end();  ++c) {
+  QMap<Q3CString, QString> custom = alarm->customProperties();
+  for (QMap<Q3CString, QString>::Iterator c = custom.begin();  c != custom.end();  ++c) {
     icalproperty *p = icalproperty_new_x(c.data().utf8());
     icalproperty_set_x_name(p,c.key());
@@ -1340,5 +1343,5 @@ void ICalFormatImpl::readIncidenceBase(icalcomponent *parent,IncidenceBase *inci
 void ICalFormatImpl::readCustomProperties(icalcomponent *parent,CustomProperties *properties)
 {
-  QMap<QCString, QString> customProperties;
+  QMap<Q3CString, QString> customProperties;
 
   icalproperty *p = icalcomponent_get_first_property(parent,ICAL_X_PROPERTY);
diff --git a/libkcal/icalformatimpl.h b/libkcal/icalformatimpl.h
index 203c302..3a35b4c 100644
--- a/libkcal/icalformatimpl.h
+++ b/libkcal/icalformatimpl.h
@@ -22,4 +22,6 @@
 
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 #include "scheduler.h"
@@ -94,6 +96,6 @@ class ICalFormatImpl {
     int mCalendarVersion;             // determines backward compatibility mode on read
 
-    QPtrList<Event> mEventsRelate;           // events with relations
-    QPtrList<Todo> mTodosRelate;             // todos with relations
+    Q3PtrList<Event> mEventsRelate;           // events with relations
+    Q3PtrList<Todo> mTodosRelate;             // todos with relations
 
     static const int mSecondsPerWeek;
diff --git a/libkcal/imipscheduler.cpp b/libkcal/imipscheduler.cpp
index e186f8e..e6d56a6 100644
--- a/libkcal/imipscheduler.cpp
+++ b/libkcal/imipscheduler.cpp
@@ -27,4 +27,6 @@
 
 #include "imipscheduler.h"
+//Added by qt3to4:
+#include <Q3PtrList>
 
 using namespace KCal;
@@ -51,7 +53,7 @@ bool IMIPScheduler::performTransaction(IncidenceBase *incidence,Method method)
 }
 
-QPtrList<ScheduleMessage> IMIPScheduler::retrieveTransactions()
+Q3PtrList<ScheduleMessage> IMIPScheduler::retrieveTransactions()
 {
-  QPtrList<ScheduleMessage> messageList;
+  Q3PtrList<ScheduleMessage> messageList;
 
   return messageList;
diff --git a/libkcal/imipscheduler.h b/libkcal/imipscheduler.h
index f142060..5a2d38e 100644
--- a/libkcal/imipscheduler.h
+++ b/libkcal/imipscheduler.h
@@ -24,5 +24,5 @@
 //
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include "scheduler.h"
@@ -41,5 +41,5 @@ class IMIPScheduler : public Scheduler {
     bool publish (IncidenceBase *incidence,const QString &recipients);
     bool performTransaction(IncidenceBase *incidence,Method method);
-    QPtrList<ScheduleMessage> retrieveTransactions();
+    Q3PtrList<ScheduleMessage> retrieveTransactions();
 };
 
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 7dd9bd2..8fcdc69 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -27,4 +27,6 @@
 #include "incidence.h"
 #include "todo.h"
+//Added by qt3to4:
+#include <Q3PtrList>
 
 using namespace KCal;
@@ -60,5 +62,5 @@ Incidence::Incidence( const Incidence &i ) : IncidenceBase( i )
 //  QPtrList<Incidence> mRelations;    QPtrList<Incidence> mRelations;
   mExDates = i.mExDates;
-  QPtrListIterator<Attachment> itat( i.mAttachments );
+  Q3PtrListIterator<Attachment> itat( i.mAttachments );
   Attachment *at;
   while( (at = itat.current()) ) {
@@ -74,5 +76,5 @@ Incidence::Incidence( const Incidence &i ) : IncidenceBase( i )
   mCancelled = i.mCancelled;
   mHasStartDate = i.mHasStartDate;
-  QPtrListIterator<Alarm> it( i.mAlarms );
+  Q3PtrListIterator<Alarm> it( i.mAlarms );
   const Alarm *a;
   while( (a = it.current()) ) {
@@ -99,5 +101,5 @@ Incidence::~Incidence()
    
   Incidence *ev;
-   QPtrList<Incidence> Relations = relations();
+   Q3PtrList<Incidence> Relations = relations();
   for (ev=Relations.first();ev;ev=Relations.next()) {
     if (ev->relatedTo() == this) ev->setRelatedTo(0);
@@ -217,6 +219,6 @@ bool KCal::operator==( const Incidence& i1, const Incidence& i2 )
     }
 #if 0
-    QPtrListIterator<Alarm> a1( i1.alarms() );
-    QPtrListIterator<Alarm> a2( i2.alarms() );
+    Q3PtrListIterator<Alarm> a1( i1.alarms() );
+    Q3PtrListIterator<Alarm> a2( i2.alarms() );
     for( ; a1.current() && a2.current(); ++a1, ++a2 ) {
         if( *a1.current() == *a2.current() ) {
@@ -323,5 +325,5 @@ void Incidence::cloneRelations( Incidence * newInc )
     Incidence * inc;
     Incidence * cloneInc;
-    QPtrList<Incidence> Relations = relations();
+    Q3PtrList<Incidence> Relations = relations();
     for (inc=Relations.first();inc;inc=Relations.next()) {
         cloneInc = inc->clone();
@@ -357,5 +359,5 @@ QDateTime Incidence::lastModifiedSub()
     mLastModifiedSub = lastModified();
     Incidence * inc;
-    QPtrList<Incidence> Relations = relations();
+    Q3PtrList<Incidence> Relations = relations();
     for (inc=Relations.first();inc;inc=Relations.next()) {
         if ( inc->lastModifiedSub() > mLastModifiedSub )
@@ -448,5 +450,5 @@ void Incidence::addCategories(const QStringList &categories, bool addToRelations
     if ( addToRelations ) {
         Incidence * inc;
-        QPtrList<Incidence> Relations = relations();
+        Q3PtrList<Incidence> Relations = relations();
         for (inc=Relations.first();inc;inc=Relations.next()) {
             inc->addCategories( categories, true );
@@ -463,5 +465,5 @@ void Incidence::setCategories(const QStringList &categories, bool setForRelation
   if ( setForRelations ) {
       Incidence * inc;
-      QPtrList<Incidence> Relations = relations();
+      Q3PtrList<Incidence> Relations = relations();
       for (inc=Relations.first();inc;inc=Relations.next()) {
           inc->setCategories( categories, true );
@@ -551,13 +553,13 @@ Incidence *Incidence::relatedTo() const
 }
 
-QPtrList<Incidence> Incidence::relations() const
+Q3PtrList<Incidence> Incidence::relations() const
 {
   return mRelations;
 }
 
-void Incidence::addRelationsToList(QPtrList<Incidence> *rel)
+void Incidence::addRelationsToList(Q3PtrList<Incidence> *rel)
 {
     Incidence* inc;
-    QPtrList<Incidence> Relations = relations();
+    Q3PtrList<Incidence> Relations = relations();
     for (inc=Relations.first();inc;inc=Relations.next()) {
         inc->addRelationsToList( rel );
@@ -648,13 +650,13 @@ void Incidence::deleteAttachments(const QString& mime)
 }
 
-QPtrList<Attachment> Incidence::attachments() const
+Q3PtrList<Attachment> Incidence::attachments() const
 {
   return mAttachments;
 }
 
-QPtrList<Attachment> Incidence::attachments(const QString& mime) const
+Q3PtrList<Attachment> Incidence::attachments(const QString& mime) const
 {
-  QPtrList<Attachment> attachments;
-  QPtrListIterator<Attachment> it( mAttachments );
+  Q3PtrList<Attachment> attachments;
+  Q3PtrListIterator<Attachment> it( mAttachments );
   Attachment *at;
   while ( (at = it.current()) ) {
@@ -738,5 +740,5 @@ QStringList Incidence::secrecyList()
 
 
-QPtrList<Alarm> Incidence::alarms() const
+Q3PtrList<Alarm> Incidence::alarms() const
 {
   return mAlarms;
@@ -772,5 +774,5 @@ bool Incidence::isAlarmEnabled() const
 {
   Alarm* alarm;
-  for (QPtrListIterator<Alarm> it(mAlarms); (alarm = it.current()) != 0; ++it) {
+  for (Q3PtrListIterator<Alarm> it(mAlarms); (alarm = it.current()) != 0; ++it) {
     if (alarm->enabled())
       return true;
diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index f89942f..2940129 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -26,5 +26,7 @@
 #include <qdatetime.h>
 #include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 #include "recurrence.h"
@@ -114,5 +116,5 @@ class Incidence : public IncidenceBase
     virtual Incidence *clone() = 0;
     virtual void cloneRelations( Incidence * );
-    void addRelationsToList(QPtrList<Incidence> *rel);
+    void addRelationsToList(Q3PtrList<Incidence> *rel);
     void clearRelations();
     virtual QDateTime getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const = 0;
@@ -178,5 +180,5 @@ class Incidence : public IncidenceBase
     Incidence *relatedTo() const;
     /** All events that are related to this event */
-    QPtrList<Incidence> relations() const;
+    Q3PtrList<Incidence> relations() const;
     /** Add an event which is related to this event */
     void addRelation(Incidence *);
@@ -203,7 +205,7 @@ class Incidence : public IncidenceBase
     void deleteAttachments(const QString& mime);
     /** return list of all associated attachments */
-    QPtrList<Attachment> attachments() const;
+    Q3PtrList<Attachment> attachments() const;
     /** find a list of attachments with this mime type */
-    QPtrList<Attachment> attachments(const QString& mime) const;
+    Q3PtrList<Attachment> attachments(const QString& mime) const;
 
     /** sets the event's status the value specified.  See the enumeration
@@ -236,5 +238,5 @@ class Incidence : public IncidenceBase
 
     /** All alarms that are associated with this incidence */
-    QPtrList<Alarm> alarms() const;
+    Q3PtrList<Alarm> alarms() const;
     /** Create a new alarm which is associated with this incidence */
     Alarm* newAlarm();
@@ -289,6 +291,6 @@ class Incidence : public IncidenceBase
     Recurrence *mRecurrence;
 protected:
-    QPtrList<Alarm> mAlarms;
-    QPtrList<Incidence> mRelations;
+    Q3PtrList<Alarm> mAlarms;
+    Q3PtrList<Incidence> mRelations;
     QDateTime mRecurrenceID;
     bool mHasRecurrenceID;
@@ -309,5 +311,5 @@ protected:
     QString mRelatedToUid;
     DateList mExDates;
-    QPtrList<Attachment> mAttachments;
+    Q3PtrList<Attachment> mAttachments;
     QStringList mResources;
     bool mHasStartDate;                  // if todo has associated start date
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index 56c0560..f11ec54 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -28,4 +28,6 @@
 
 #include "incidencebase.h"
+//Added by qt3to4:
+#include <Q3PtrList>
 
 using namespace KCal;
@@ -65,5 +67,5 @@ IncidenceBase::IncidenceBase(const IncidenceBase &i) :
   mAlarmEnabled = i.mAlarmEnabled;
   mCalID = i.mCalID;
-  QPtrList<Attendee> attendees = i.attendees();
+  Q3PtrList<Attendee> attendees = i.attendees();
   for( Attendee *a = attendees.first(); a; a = attendees.next() ) {
     mAttendees.append( new Attendee( *a ) );
@@ -301,5 +303,5 @@ bool IncidenceBase::addAttendee(Attendee *a, bool doupdate)
     a->setName(a->name().remove(0,7));
 
-  QPtrListIterator<Attendee> qli(mAttendees);
+  Q3PtrListIterator<Attendee> qli(mAttendees);
   
   qli.toFirst();
@@ -344,5 +346,5 @@ void IncidenceBase::clearAttendees()
 Attendee *IncidenceBase::getAttendee(const char *n) const
 {
-  QPtrListIterator<Attendee> qli(mAttendees);
+  Q3PtrListIterator<Attendee> qli(mAttendees);
 
   qli.toFirst();
@@ -358,5 +360,5 @@ Attendee *IncidenceBase::getAttendee(const char *n) const
 Attendee *IncidenceBase::attendeeByMail(const QString &email)
 {
-  QPtrListIterator<Attendee> qli(mAttendees);
+  Q3PtrListIterator<Attendee> qli(mAttendees);
 
   qli.toFirst();
@@ -371,5 +373,5 @@ Attendee *IncidenceBase::attendeeByMail(const QString &email)
 Attendee *IncidenceBase::attendeeByMails(const QStringList &emails, const QString& email)
 {
-  QPtrListIterator<Attendee> qli(mAttendees);
+  Q3PtrListIterator<Attendee> qli(mAttendees);
 
   QStringList mails = emails;
@@ -492,5 +494,5 @@ void IncidenceBase::unRegisterObserver( IncidenceBase::Observer *observer )
 void IncidenceBase::updated()
 {
-  QPtrListIterator<Observer> it(mObservers);
+  Q3PtrListIterator<Observer> it(mObservers);
   while( it.current() ) {
     Observer *o = it.current();
diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h
index 3edc03b..d97f524 100644
--- a/libkcal/incidencebase.h
+++ b/libkcal/incidencebase.h
@@ -26,6 +26,8 @@
 #include <qdatetime.h>
 #include <qstringlist.h>
-#include <qvaluelist.h>
-#include <qptrlist.h>
+#include <q3valuelist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include "customproperties.h"
@@ -34,5 +36,5 @@
 namespace KCal {
 
-typedef QValueList<QDate> DateList;
+typedef Q3ValueList<QDate> DateList;
  enum IncTypeID { eventID,todoID,journalID,freebusyID };
 
@@ -52,5 +54,5 @@ class IncidenceBase : public CustomProperties
     virtual ~IncidenceBase();
 
-    virtual QCString type() const = 0;
+    virtual Q3CString type() const = 0;
     virtual  IncTypeID typeID() const = 0;
 
@@ -110,5 +112,5 @@ class IncidenceBase : public CustomProperties
     void clearAttendees();
     /** Return list of attendees. */
-    QPtrList<Attendee> attendees() const { return mAttendees; };
+    Q3PtrList<Attendee> attendees() const { return mAttendees; };
     /** Return number of attendees. */
     int attendeeCount() const { return mAttendees.count(); };
@@ -169,5 +171,5 @@ class IncidenceBase : public CustomProperties
     bool mAlarmEnabled;
     QDateTime mLastModified;
-    QPtrList<Attendee> mAttendees;
+    Q3PtrList<Attendee> mAttendees;
 
     bool mFloats;
@@ -182,5 +184,5 @@ class IncidenceBase : public CustomProperties
     int mSyncStatus;                      // status (for sync)
 
-    QPtrList<Observer> mObservers;
+    Q3PtrList<Observer> mObservers;
 };
 
diff --git a/libkcal/journal.h b/libkcal/journal.h
index 1cd0a22..c83356f 100644
--- a/libkcal/journal.h
+++ b/libkcal/journal.h
@@ -25,4 +25,6 @@
 
 #include "incidence.h"
+//Added by qt3to4:
+#include <Q3CString>
 
 namespace KCal {
@@ -37,5 +39,5 @@ class Journal : public Incidence
     ~Journal();
 
-    QCString type() const { return "Journal"; }
+    Q3CString type() const { return "Journal"; }
     IncTypeID typeID() const { return journalID; }
     
diff --git a/libkcal/kincidenceformatter.cpp b/libkcal/kincidenceformatter.cpp
index 733b897..bce68b0 100644
--- a/libkcal/kincidenceformatter.cpp
+++ b/libkcal/kincidenceformatter.cpp
@@ -5,4 +5,6 @@
 #ifdef DEKTOP_VERSION
 #include <kabc/stdaddressbook.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 #define size count
 #endif
@@ -311,5 +313,5 @@ void KIncidenceFormatter::formatCategories(Incidence *event)
 void KIncidenceFormatter::addTag(const QString & tag,const QString & text)
 {
-  int number=text.contains("\n");
+  int number=text.count("\n");
     QString str = "<" + tag + ">";
     QString tmpText=text;
@@ -340,5 +342,5 @@ void KIncidenceFormatter::addTag(const QString & tag,const QString & text)
 void KIncidenceFormatter::formatAttendees(Incidence *event)
 {
- QPtrList<Attendee> attendees = event->attendees();
+ Q3PtrList<Attendee> attendees = event->attendees();
     if (attendees.count()) {
         QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small);
@@ -363,5 +365,5 @@ void KIncidenceFormatter::formatAttendees(Incidence *event)
         mText.append(event->organizer());
 #endif
-        if (iconPath) {
+        if (!iconPath.isEmpty()) {
             mText += " <a href=\"mailto:" + event->organizer() + "\">";
             mText += "<IMG src=\"" + iconPath + "\">";
@@ -403,5 +405,5 @@ void KIncidenceFormatter::formatAttendees(Incidence *event)
 
             if (!a->email().isEmpty()) {
-                if (iconPath) {
+                if (!iconPath.isEmpty()) {
                     mText += "<a href=\"mailto:" + a->name() +" "+ "<" + a->email() + ">" + "\">"; 
                     if ( a->RSVP() )
diff --git a/libkcal/libkcal.pro b/libkcal/libkcal.pro
index 33c63c3..1f43b10 100644
--- a/libkcal/libkcal.pro
+++ b/libkcal/libkcal.pro
@@ -1,5 +1,5 @@
 TEMPLATE	= lib
 CONFIG		+= qt warn_on
-TARGET		= microkcal
+TARGET		= xmicrokcal
 
 include( ../variables.pri )
@@ -107,2 +107,6 @@ dndfactory.cpp \
  phoneformat.cpp \
 
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
+#The following line was inserted by qt3to4
+QT +=  
diff --git a/libkcal/libkcalE.pro b/libkcal/libkcalE.pro
index 737be53..fe46656 100644
--- a/libkcal/libkcalE.pro
+++ b/libkcal/libkcalE.pro
@@ -1,5 +1,5 @@
 TEMPLATE	= lib
 CONFIG		+= qt warn_on
-TARGET		= microkcal
+TARGET		= xmicrokcal
 
 INCLUDEPATH += ../libkdepim ../microkde ../qtcompat versit ../microkde/kdecore $(QPEDIR)/include
diff --git a/libkcal/listbase.h b/libkcal/listbase.h
index 085b13d..6c942ef 100644
--- a/libkcal/listbase.h
+++ b/libkcal/listbase.h
@@ -22,5 +22,7 @@
 #define KCAL_LISTBASE_H
 
-#include <qvaluelist.h>
+#include <q3valuelist.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 namespace KCal {
@@ -32,14 +34,14 @@ namespace KCal {
 */
 template<class T> 
-class ListBase : public QValueList<T *>
+class ListBase : public Q3ValueList<T *>
 {
   public:
     ListBase()
-      : QValueList<T *>(), mAutoDelete( false )
+      : Q3ValueList<T *>(), mAutoDelete( false )
     {
     }
 
     ListBase( const ListBase &l )
-      : QValueList<T *>( l ), mAutoDelete( false )
+      : Q3ValueList<T *>( l ), mAutoDelete( false )
     {
     }
@@ -48,6 +50,6 @@ class ListBase : public QValueList<T *>
     {
       if ( mAutoDelete ) {
-        QValueListIterator<T *> it;
-        for( it = QValueList<T*>::begin(); it != QValueList<T*>::end(); ++it ) {
+        Q3ValueListIterator<T *> it;
+        for( it = Q3ValueList<T*>::begin(); it != Q3ValueList<T*>::end(); ++it ) {
           delete *it;
         }
@@ -58,5 +60,5 @@ class ListBase : public QValueList<T *>
     {
       if ( this == &l ) return *this;
-      QValueList<T *>::operator=( l );
+      Q3ValueList<T *>::operator=( l );
       return *this;
     }
@@ -69,6 +71,6 @@ class ListBase : public QValueList<T *>
     bool removeRef( T *t )
     {
-      QValueListIterator<T *> it = find( t );
-      if ( it == QValueList<T*>::end() ) {
+      Q3ValueListIterator<T *> it = find( t );
+      if ( it == Q3ValueList<T*>::end() ) {
         return false;
       } else {
@@ -78,6 +80,6 @@ class ListBase : public QValueList<T *>
       }
     }
-    void fill ( QPtrList<T> list ) {
-        QPtrListIterator<T> it (list);
+    void fill ( Q3PtrList<T> list ) {
+        Q3PtrListIterator<T> it (list);
         T *item;
         while ( (item = it.current()) != 0 ) {
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index 900fc04..794e4b4 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -23,13 +23,14 @@
 #include <qstring.h>
 #include <qapplication.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qregexp.h>
 #include <qmessagebox.h>
 #include <qclipboard.h>
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
 #include <qdir.h>
 #include <qlabel.h>
+#include <QDesktopWidget>
 
 #include <kdebug.h>
@@ -202,5 +203,5 @@ ulong PhoneFormat::getCsumEvent( Event* event )
             {
                 int count = 1;
-                QPtrList<Recurrence::rMonthPos> rmp;
+                Q3PtrList<Recurrence::rMonthPos> rmp;
                 rmp = rec->monthPositions();
                 if ( rmp.first()->negative )
@@ -242,5 +243,5 @@ ulong PhoneFormat::getCsumEvent( Event* event )
         if ( rec->endDate().isValid() ) { // 15 + 16
             list.append( "1" );
-            list.append( PhoneParser::dtToString( rec->endDate()) );
+            list.append( PhoneParser::dtToString( (QDateTime)rec->endDate()) );
         } else {
             list.append( "0" );
@@ -306,5 +307,5 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
     if ( ! vfload.load( calendar, fileName ) )
         return false;
-    QPtrList<Event> er = calendar->rawEvents();
+    Q3PtrList<Event> er = calendar->rawEvents();
     Event* ev = er.first();  
     qDebug("reading events... "); 
@@ -341,5 +342,5 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
     {
         qDebug("reading todos... "); 
-        QPtrList<Todo> tr = calendar->rawTodos();
+        Q3PtrList<Todo> tr = calendar->rawTodos();
         Todo* ev = tr.first();  
         while ( ev ) {
@@ -466,5 +467,5 @@ void PhoneFormat::copyTodo( Todo* to,  Todo* from )
 
 }
-#include <qcstring.h>
+#include <q3cstring.h>
 
 void PhoneFormat::afterSave( Incidence* inc,const QString& id ,const QString& csum)
@@ -498,5 +499,5 @@ bool PhoneFormat::save( Calendar *calendar)
 
     // 1 remove events which should be deleted
-    QPtrList<Event> er = calendar->rawEvents();
+    Q3PtrList<Event> er = calendar->rawEvents();
     Event* ev = er.first();  
     while ( ev ) {
@@ -509,5 +510,5 @@ bool PhoneFormat::save( Calendar *calendar)
     }
     //  2 remove todos which should be deleted
-    QPtrList<Todo> tl = calendar->rawTodos(); 
+    Q3PtrList<Todo> tl = calendar->rawTodos(); 
     Todo* to = tl.first();
     while ( to ) {
@@ -553,5 +554,5 @@ bool PhoneFormat::save( Calendar *calendar)
     ev = er.first(); 
     message = i18n(" Comparing event # ");
-    QPtrList<Event> er1 = calendarTemp->rawEvents();
+    Q3PtrList<Event> er1 = calendarTemp->rawEvents();
     Event* ev1; 
     int procCount = 0;
@@ -581,5 +582,5 @@ bool PhoneFormat::save( Calendar *calendar)
     to = tl.first();
     procCount = 0;
-    QPtrList<Todo> tl1 = calendarTemp->rawTodos(); 
+    Q3PtrList<Todo> tl1 = calendarTemp->rawTodos(); 
     Todo* to1 ;
     message = i18n(" Comparing todo # ");
diff --git a/libkcal/qtopiaformat.cpp b/libkcal/qtopiaformat.cpp
index 0a4a031..2dfe1a4 100644
--- a/libkcal/qtopiaformat.cpp
+++ b/libkcal/qtopiaformat.cpp
@@ -22,9 +22,9 @@
 #include <qdatetime.h>
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qregexp.h>
 #include <qclipboard.h>
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qxml.h>
 
@@ -310,10 +310,10 @@ bool QtopiaFormat::save( Calendar *calendar, const QString &fileName )
 
   QFile file( fileName );
-  if (!file.open( IO_WriteOnly ) ) {
+  if (!file.open( QIODevice::WriteOnly ) ) {
     setException(new ErrorFormat(ErrorFormat::SaveError,
                  i18n("Could not open file '%1'").arg(fileName)));
     return false;
   }
-  QTextStream ts( &file );
+  Q3TextStream ts( &file );
   ts << text;
   file.close();
diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp
index 6ee5499..9a4e540 100644
--- a/libkcal/recurrence.cpp
+++ b/libkcal/recurrence.cpp
@@ -30,4 +30,7 @@
 
 #include "recurrence.h"
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3PtrList>
 
 using namespace KCal;
@@ -57,5 +60,5 @@ Recurrence::Recurrence(const Recurrence &r, Incidence *parent)
 : recurs(r.recurs),
   rWeekStart(r.rWeekStart),
-  rDays(r.rDays.copy()),
+  rDays(r.rDays),
   rFreq(r.rFreq),
   rDuration(r.rDuration),
@@ -71,17 +74,17 @@ Recurrence::Recurrence(const Recurrence &r, Incidence *parent)
   mParent(parent)
 {
-  for (QPtrListIterator<rMonthPos> mp(r.rMonthPositions);  mp.current();  ++mp) {
+  for (Q3PtrListIterator<rMonthPos> mp(r.rMonthPositions);  mp.current();  ++mp) {
     rMonthPos *tmp = new rMonthPos;
     tmp->rPos     = mp.current()->rPos;
     tmp->negative = mp.current()->negative;
-    tmp->rDays    = mp.current()->rDays.copy();
+    tmp->rDays    = mp.current()->rDays;
     rMonthPositions.append(tmp);
   }
-  for (QPtrListIterator<int> md(r.rMonthDays);  md.current();  ++md) {
+  for (Q3PtrListIterator<int> md(r.rMonthDays);  md.current();  ++md) {
     int *tmp = new int;
     *tmp = *md.current();
     rMonthDays.append(tmp);
   }
-  for (QPtrListIterator<int> yn(r.rYearNums);  yn.current();  ++yn) {
+  for (Q3PtrListIterator<int> yn(r.rYearNums);  yn.current();  ++yn) {
     int *tmp = new int;
     *tmp = *yn.current();
@@ -125,6 +128,6 @@ bool Recurrence::operator==( const Recurrence& r2 ) const
       &&     rWeekStart == r2.rWeekStart;
   case rMonthlyPos: {
-      QPtrList<rMonthPos> MonthPositions = rMonthPositions;
-      QPtrList<rMonthPos> MonthPositions2 = r2.rMonthPositions;
+      Q3PtrList<rMonthPos> MonthPositions = rMonthPositions;
+      Q3PtrList<rMonthPos> MonthPositions2 = r2.rMonthPositions;
       if ( !MonthPositions.count() )
           return false;
@@ -134,6 +137,6 @@ bool Recurrence::operator==( const Recurrence& r2 ) const
   }
   case rMonthlyDay: {
-      QPtrList<int> MonthDays = rMonthDays ; 
-      QPtrList<int> MonthDays2 = r2.rMonthDays ;  
+      Q3PtrList<int> MonthDays = rMonthDays ; 
+      Q3PtrList<int> MonthDays2 = r2.rMonthDays ;  
       if ( !MonthDays.count() )
           return false;
@@ -144,10 +147,10 @@ bool Recurrence::operator==( const Recurrence& r2 ) const
   case rYearlyPos: {
 
-      QPtrList<int> YearNums = rYearNums;
-      QPtrList<int> YearNums2 = r2.rYearNums;
+      Q3PtrList<int> YearNums = rYearNums;
+      Q3PtrList<int> YearNums2 = r2.rYearNums;
       if ( *YearNums.first() != *YearNums2.first() )
           return false;
-      QPtrList<rMonthPos> MonthPositions = rMonthPositions;
-      QPtrList<rMonthPos> MonthPositions2 = r2.rMonthPositions;
+      Q3PtrList<rMonthPos> MonthPositions = rMonthPositions;
+      Q3PtrList<rMonthPos> MonthPositions2 = r2.rMonthPositions;
       if ( !MonthPositions.count() )
           return false;
@@ -158,11 +161,11 @@ bool Recurrence::operator==( const Recurrence& r2 ) const
   }
   case rYearlyMonth: {
-      QPtrList<int> YearNums = rYearNums;
-      QPtrList<int> YearNums2 = r2.rYearNums;
+      Q3PtrList<int> YearNums = rYearNums;
+      Q3PtrList<int> YearNums2 = r2.rYearNums;
       return ( *YearNums.first() == *YearNums2.first()  && mFeb29YearlyType == r2.mFeb29YearlyType);
   }
       case rYearlyDay: {
-      QPtrList<int> YearNums = rYearNums;
-      QPtrList<int> YearNums2 = r2.rYearNums;
+      Q3PtrList<int> YearNums = rYearNums;
+      Q3PtrList<int> YearNums2 = r2.rYearNums;
       return ( *YearNums.first() == *YearNums2.first() );
       }
@@ -358,5 +361,5 @@ QDateTime Recurrence::endDateTime() const
       return mRecurStart.addSecs((rDuration-1+mRecurExDatesCount)*rFreq*3600);
     case rDaily:
-      return dStart.addDays((rDuration-1+mRecurExDatesCount)*rFreq);
+      return (QDateTime)dStart.addDays((rDuration-1+mRecurExDatesCount)*rFreq);
 
     case rWeekly:
@@ -507,15 +510,15 @@ const QBitArray &Recurrence::days() const
 }
 
-const QPtrList<Recurrence::rMonthPos> &Recurrence::monthPositions() const
+const Q3PtrList<Recurrence::rMonthPos> &Recurrence::monthPositions() const
 {
   return rMonthPositions;
 }
 
-const QPtrList<Recurrence::rMonthPos> &Recurrence::yearMonthPositions() const
+const Q3PtrList<Recurrence::rMonthPos> &Recurrence::yearMonthPositions() const
 {
   return rMonthPositions;
 }
 
-const QPtrList<int> &Recurrence::monthDays() const
+const Q3PtrList<int> &Recurrence::monthDays() const
 {
   return rMonthDays;
@@ -760,5 +763,5 @@ void Recurrence::addYearlyMonthPos(short _rPos, const QBitArray &_rDays)
 }
 
-const QPtrList<int> &Recurrence::yearNums() const
+const Q3PtrList<int> &Recurrence::yearNums() const
 {
   return rYearNums;
@@ -1048,5 +1051,5 @@ bool Recurrence::recursMonthly(const QDate &qd) const
          rDuration == -1)) {
       // The date queried falls within the range of the event.
-      QValueList<int> days;
+      Q3ValueList<int> days;
       int daysInMonth = qd.daysInMonth();
       if (recurs == rMonthlyDay)
@@ -1054,5 +1057,5 @@ bool Recurrence::recursMonthly(const QDate &qd) const
       else if (recurs == rMonthlyPos)
         getMonthlyPosDays(days, daysInMonth, QDate(year, month, 1).dayOfWeek());
-      for (QValueList<int>::Iterator it = days.begin();  it != days.end();  ++it) {
+      for (Q3ValueList<int>::Iterator it = days.begin();  it != days.end();  ++it) {
         if (*it == day)
           return true;
@@ -1102,5 +1105,5 @@ bool Recurrence::recursYearlyByMonth(const QDate &qd) const
         // The date queried falls within the range of the event.
         int i = qmonth;
-        for (QPtrListIterator<int> qlin(rYearNums); qlin.current(); ++qlin) {
+        for (Q3PtrListIterator<int> qlin(rYearNums); qlin.current(); ++qlin) {
           if (i == *qlin.current())
             return true;
@@ -1128,10 +1131,10 @@ bool Recurrence::recursYearlyByPos(const QDate &qd) const
          rDuration == -1)) {
       // The date queried falls within the range of the event.
-      for (QPtrListIterator<int> qlin(rYearNums); qlin.current(); ++qlin) {
+      for (Q3PtrListIterator<int> qlin(rYearNums); qlin.current(); ++qlin) {
         if (month == *qlin.current()) {
           // The month recurs
-          QValueList<int> days;
+          Q3ValueList<int> days;
           getMonthlyPosDays(days, qd.daysInMonth(), QDate(year, month, 1).dayOfWeek());
-          for (QValueList<int>::Iterator it = days.begin();  it != days.end();  ++it) {
+          for (Q3ValueList<int>::Iterator it = days.begin();  it != days.end();  ++it) {
             if (*it == day)
               return true;
@@ -1158,5 +1161,5 @@ bool Recurrence::recursYearlyByDay(const QDate &qd) const
       // The date queried falls within the range of the event.
       int i = qd.dayOfYear();
-      for (QPtrListIterator<int> qlin(rYearNums); qlin.current(); ++qlin) {
+      for (Q3PtrListIterator<int> qlin(rYearNums); qlin.current(); ++qlin) {
         if (i == *qlin.current())
           return true;
@@ -1550,5 +1553,5 @@ int Recurrence::recurCalc(PeriodFunc func, QDate &enddate) const
     case NEXT_AFTER_DATE:
       if (count == 0)
-        endtime = QDate();
+        endtime = QDateTime();
       else if (timed)
         enddate = endtime.date();
@@ -1794,6 +1797,6 @@ struct Recurrence::MonthlyData {
     bool              varies;        // true if recurring days vary between different months
   private:
-    QValueList<int>   days28, days29, days30, days31;   // recurring days in months of each length
-    QValueList<int>  *recurDays[4];
+    Q3ValueList<int>   days28, days29, days30, days31;   // recurring days in months of each length
+    Q3ValueList<int>  *recurDays[4];
   public:
     MonthlyData(const Recurrence* r, const QDate &date)
@@ -1806,10 +1809,10 @@ struct Recurrence::MonthlyData {
                         ? true : recurrence->getMonthlyDayDays(days31, 31);
              }
-    const QValueList<int>* dayList() const {
+    const Q3ValueList<int>* dayList() const {
             if (!varies)
               return &days31;
             QDate startOfMonth(year, month + 1, 1);
             int daysInMonth = startOfMonth.daysInMonth();
-            QValueList<int>* days = recurDays[daysInMonth - 28];
+            Q3ValueList<int>* days = recurDays[daysInMonth - 28];
             if (recurrence->recurs == rMonthlyPos)
               recurrence->getMonthlyPosDays(*days, daysInMonth, startOfMonth.dayOfWeek());
@@ -1845,6 +1848,6 @@ int Recurrence::monthlyCalcEndDate(QDate &enddate, MonthlyData &data) const
   uint countTogo = rDuration + mRecurExDatesCount;
   int  countGone = 0;
-  QValueList<int>::ConstIterator it;
-  const QValueList<int>* days = data.dayList();
+  Q3ValueList<int>::ConstIterator it;
+  const Q3ValueList<int>* days = data.dayList();
 
   if (data.day > 1) {
@@ -1911,6 +1914,6 @@ int Recurrence::monthlyCalcToDate(const QDate &enddate, MonthlyData &data) const
   int endDay   = enddate.day();
   int endYearMonth = endYear*12 + endMonth;
-  QValueList<int>::ConstIterator it;
-  const QValueList<int>* days = data.dayList();
+  Q3ValueList<int>::ConstIterator it;
+  const Q3ValueList<int>* days = data.dayList();
 
   if (data.day > 1) {
@@ -1970,6 +1973,6 @@ int Recurrence::monthlyCalcNextAfter(QDate &enddate, MonthlyData &data) const
   int endDay  = enddate.day();
   int endYearMonth = endYear*12 + enddate.month() - 1;
-  QValueList<int>::ConstIterator it;
-  const QValueList<int>* days = data.dayList();
+  Q3ValueList<int>::ConstIterator it;
+  const Q3ValueList<int>* days = data.dayList();
 
   if (data.day > 1) {
@@ -2053,6 +2056,6 @@ struct Recurrence::YearlyMonthData {
     bool              feb29;         // true if February 29th recurs
   private:
-    QValueList<int>   months;        // recurring months in non-leap years  1..12
-    QValueList<int>   leapMonths;    // recurring months in leap years  1..12
+    Q3ValueList<int>   months;        // recurring months in non-leap years  1..12
+    Q3ValueList<int>   leapMonths;    // recurring months in leap years  1..12
   public:
     YearlyMonthData(const Recurrence* r, const QDate &date)
@@ -2061,7 +2064,7 @@ struct Recurrence::YearlyMonthData {
             leapyear = feb29 && QDate::leapYear(year);
           }
-    const QValueList<int>* monthList() const
+    const Q3ValueList<int>* monthList() const
                          { return leapyear ? &leapMonths : &months; }
-    const QValueList<int>* leapMonthList() const  { return &leapMonths; }
+    const Q3ValueList<int>* leapMonthList() const  { return &leapMonths; }
     QDate            date() const  { return QDate(year, month, day); }
 };
@@ -2089,6 +2092,6 @@ int Recurrence::yearlyMonthCalcEndDate(QDate &enddate, YearlyMonthData &data) co
   uint countTogo = rDuration + mRecurExDatesCount;
   int  countGone = 0;
-  QValueList<int>::ConstIterator it;
-  const QValueList<int>* mons = data.monthList();   // get recurring months for this year
+  Q3ValueList<int>::ConstIterator it;
+  const Q3ValueList<int>* mons = data.monthList();   // get recurring months for this year
 
   if (data.month > 1) {
@@ -2200,6 +2203,6 @@ int Recurrence::yearlyMonthCalcToDate(const QDate &enddate, YearlyMonthData &dat
     }
   }
-  QValueList<int>::ConstIterator it;
-  const QValueList<int>* mons = data.monthList();
+  Q3ValueList<int>::ConstIterator it;
+  const Q3ValueList<int>* mons = data.monthList();
 
   if (data.month > 1) {
@@ -2271,6 +2274,6 @@ int Recurrence::yearlyMonthCalcNextAfter(QDate &enddate, YearlyMonthData &data)
     }
   }
-  QValueList<int>::ConstIterator it;
-  const QValueList<int>* mons = data.monthList();
+  Q3ValueList<int>::ConstIterator it;
+  const Q3ValueList<int>* mons = data.monthList();
 
   if (data.month > 1) {
@@ -2391,5 +2394,5 @@ struct Recurrence::YearlyPosData {
     bool              varies;        // true if number of days varies from year to year
   private:
-    mutable QValueList<int> days;
+    mutable Q3ValueList<int> days;
   public:
     YearlyPosData(const Recurrence* r, const QDate &date)
@@ -2399,5 +2402,5 @@ struct Recurrence::YearlyPosData {
               varies = (daysPerMonth < 0);
             }
-    const QValueList<int>* dayList() const {
+    const Q3ValueList<int>* dayList() const {
             QDate startOfMonth(year, month, 1);
             recurrence->getMonthlyPosDays(days, startOfMonth.daysInMonth(), startOfMonth.dayOfWeek());
@@ -2429,10 +2432,10 @@ int Recurrence::yearlyPosCalcEndDate(QDate &enddate, YearlyPosData &data) const
   uint countTogo = rDuration + mRecurExDatesCount;
   int  countGone = 0;
-  QValueList<int>::ConstIterator id;
-  const QValueList<int>* days;
+  Q3ValueList<int>::ConstIterator id;
+  const Q3ValueList<int>* days;
 
   if (data.month > 1 || data.day > 1) {
     // Check what remains of the start year
-    for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) {
+    for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) {
       if (*im.current() >= data.month) {
         // Check what remains of the start month
@@ -2467,5 +2470,5 @@ int Recurrence::yearlyPosCalcEndDate(QDate &enddate, YearlyPosData &data) const
     // The number of recurrences varies from year to year.
     for ( ; ; ) {
-      for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) {
+      for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) {
         data.month = *im.current();
         days = data.dayList();
@@ -2497,5 +2500,5 @@ int Recurrence::yearlyPosCalcEndDate(QDate &enddate, YearlyPosData &data) const
 
     // Check the last year in the recurrence.
-    for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) {
+    for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) {
       if (static_cast<uint>(data.daysPerMonth) >= countTogo) {
         // Check the last month in the recurrence
@@ -2532,10 +2535,10 @@ int Recurrence::yearlyPosCalcToDate(const QDate &enddate, YearlyPosData &data) c
   }
   int endYearMonth = endYear*12 + endMonth;
-  QValueList<int>::ConstIterator id;
-  const QValueList<int>* days;
+  Q3ValueList<int>::ConstIterator id;
+  const Q3ValueList<int>* days;
 
   if (data.month > 1 || data.day > 1) {
     // Check what remains of the start year
-    for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) {
+    for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) {
       if (*im.current() >= data.month) {
         data.month = *im.current();
@@ -2577,5 +2580,5 @@ int Recurrence::yearlyPosCalcToDate(const QDate &enddate, YearlyPosData &data) c
     // The number of recurrences varies from year to year.
     for ( ; ; ) {
-      for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) {
+      for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) {
         data.month = *im.current();
         days = data.dayList();
@@ -2612,5 +2615,5 @@ int Recurrence::yearlyPosCalcToDate(const QDate &enddate, YearlyPosData &data) c
 
     // Check the last year in the recurrence.
-    for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) {
+    for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) {
       data.month = *im.current();
       if (data.month >= endMonth) {
@@ -2647,6 +2650,6 @@ int Recurrence::yearlyPosCalcNextAfter(QDate &enddate, YearlyPosData &data) cons
   }
   int endYearMonth = endYear*12 + endMonth;
-  QValueList<int>::ConstIterator id;
-  const QValueList<int>* days;
+  Q3ValueList<int>::ConstIterator id;
+  const Q3ValueList<int>* days;
 
   if (data.varies) {
@@ -2654,5 +2657,5 @@ int Recurrence::yearlyPosCalcNextAfter(QDate &enddate, YearlyPosData &data) cons
     for ( ; ; ) {
       // Check the next year
-      for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) {
+      for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) {
         if (*im.current() >= data.month) {
           // Check the next month
@@ -2690,5 +2693,5 @@ int Recurrence::yearlyPosCalcNextAfter(QDate &enddate, YearlyPosData &data) cons
     if (data.month > 1 || data.day > 1) {
       // Check what remains of the start year
-      for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) {
+      for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) {
         if (*im.current() >= data.month) {
           // Check what remains of the start month
@@ -2735,5 +2738,5 @@ int Recurrence::yearlyPosCalcNextAfter(QDate &enddate, YearlyPosData &data) cons
 
     // Check the last year in the recurrence
-    for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) {
+    for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) {
       data.month = *im.current();
       int ended = data.yearMonth() - endYearMonth;
@@ -2809,5 +2812,5 @@ int Recurrence::yearlyDayCalcEndDate(QDate &enddate, YearlyDayData &data) const
     // Check what remains of the start year
     bool leapOK = data.isMaxDayCount();
-    for (QPtrListIterator<int> it(rYearNums); it.current(); ++it) {
+    for (Q3PtrListIterator<int> it(rYearNums); it.current(); ++it) {
       int d = *it.current();
       if (d >= data.day && (leapOK || d < 366)) {
@@ -2847,5 +2850,5 @@ int Recurrence::yearlyDayCalcEndDate(QDate &enddate, YearlyDayData &data) const
   if (countTogo) {
     // Check the last year in the recurrence
-    for (QPtrListIterator<int> it(rYearNums); it.current(); ++it) {
+    for (Q3PtrListIterator<int> it(rYearNums); it.current(); ++it) {
       ++countGone;
       if (--countTogo == 0) {
@@ -2870,5 +2873,5 @@ int Recurrence::yearlyDayCalcToDate(const QDate &enddate, YearlyDayData &data) c
     // Check what remains of the start year
     bool leapOK = data.isMaxDayCount();
-    for (QPtrListIterator<int> it(rYearNums); it.current(); ++it) {
+    for (Q3PtrListIterator<int> it(rYearNums); it.current(); ++it) {
       int d = *it.current();
       if (d >= data.day && (leapOK || d < 366)) {
@@ -2909,5 +2912,5 @@ int Recurrence::yearlyDayCalcToDate(const QDate &enddate, YearlyDayData &data) c
   if (data.year <= endYear) {
     // Check the last year in the recurrence
-    for (QPtrListIterator<int> it(rYearNums); it.current(); ++it) {
+    for (Q3PtrListIterator<int> it(rYearNums); it.current(); ++it) {
       if (*it.current() > endDay)
         return countGone;
@@ -2929,5 +2932,5 @@ int Recurrence::yearlyDayCalcNextAfter(QDate &enddate, YearlyDayData &data) cons
     // Check what remains of the start year
     bool leapOK = data.isMaxDayCount();
-    for (QPtrListIterator<int> it(rYearNums); it.current(); ++it) {
+    for (Q3PtrListIterator<int> it(rYearNums); it.current(); ++it) {
       int d = *it.current();
       if (d >= data.day && (leapOK || d < 366)) {
@@ -2978,5 +2981,5 @@ int Recurrence::yearlyDayCalcNextAfter(QDate &enddate, YearlyDayData &data) cons
 
   // Check the last year in the recurrence
-  for (QPtrListIterator<int> it(rYearNums); it.current(); ++it) {
+  for (Q3PtrListIterator<int> it(rYearNums); it.current(); ++it) {
     ++countGone;
     int d = *it.current();
@@ -2996,5 +2999,5 @@ ex:
 // Parameters: daysInMonth = number of days in this month
 //             startDayOfWeek = day of week for first day of month.
-void Recurrence::getMonthlyPosDays(QValueList<int> &list, int daysInMonth, int startDayOfWeek) const
+void Recurrence::getMonthlyPosDays(Q3ValueList<int> &list, int daysInMonth, int startDayOfWeek) const
 {
   list.clear();
@@ -3002,5 +3005,5 @@ void Recurrence::getMonthlyPosDays(QValueList<int> &list, int daysInMonth, int s
   // Go through the list, compiling a bit list of actual day numbers
   Q_UINT32 days = 0;
-  for (QPtrListIterator<rMonthPos> pos(rMonthPositions); pos.current(); ++pos) {
+  for (Q3PtrListIterator<rMonthPos> pos(rMonthPositions); pos.current(); ++pos) {
     int weeknum = pos.current()->rPos - 1;   // get 0-based week number
     QBitArray &rdays = pos.current()->rDays;
@@ -3040,5 +3043,5 @@ int Recurrence::countMonthlyPosDays() const
   Q_UINT8 positive[5] = { 0, 0, 0, 0, 0 };
   Q_UINT8 negative[4] = { 0, 0, 0, 0 };
-  for (QPtrListIterator<rMonthPos> pos(rMonthPositions); pos.current(); ++pos) {
+  for (Q3PtrListIterator<rMonthPos> pos(rMonthPositions); pos.current(); ++pos) {
     int weeknum = pos.current()->rPos;
     Q_UINT8* wk;
@@ -3073,10 +3076,10 @@ int Recurrence::countMonthlyPosDays() const
 // Get the days in this month which recur, in numerical order.
 // Reply = true if day numbers varies from month to month.
-bool Recurrence::getMonthlyDayDays(QValueList<int> &list, int daysInMonth) const
+bool Recurrence::getMonthlyDayDays(Q3ValueList<int> &list, int daysInMonth) const
 {
   list.clear();
   bool variable = false;
   Q_UINT32 days = 0;
-  for (QPtrListIterator<int> it(rMonthDays); it.current(); ++it) {
+  for (Q3PtrListIterator<int> it(rMonthDays); it.current(); ++it) {
     int day = *it.current();
     if (day > 0) {
@@ -3107,10 +3110,10 @@ bool Recurrence::getMonthlyDayDays(QValueList<int> &list, int daysInMonth) const
 // included in the non-leap year month list.
 // Reply = true if February 29th also recurs.
-bool Recurrence::getYearlyMonthMonths(int day, QValueList<int> &list, QValueList<int> &leaplist) const
+bool Recurrence::getYearlyMonthMonths(int day, Q3ValueList<int> &list, Q3ValueList<int> &leaplist) const
 {
   list.clear();
   leaplist.clear();
   bool feb29 = false;
-  for (QPtrListIterator<int> it(rYearNums); it.current(); ++it) {
+  for (Q3PtrListIterator<int> it(rYearNums); it.current(); ++it) {
     int month = *it.current();
     if (month == 2) {
@@ -3188,5 +3191,5 @@ QDate Recurrence::getFirstDateInMonth(const QDate &earliestDate) const
     case rMonthlyDay: {
       int minday = daysInMonth + 1;
-      for (QPtrListIterator<int> it(rMonthDays);  it.current();  ++it) {
+      for (Q3PtrListIterator<int> it(rMonthDays);  it.current();  ++it) {
         int day = *it.current();
         if (day < 0)
@@ -3202,7 +3205,7 @@ QDate Recurrence::getFirstDateInMonth(const QDate &earliestDate) const
     case rYearlyPos: {
       QDate monthBegin(earliestDate.addDays(1 - earliestDay));
-      QValueList<int> dayList;
+      Q3ValueList<int> dayList;
       getMonthlyPosDays(dayList, daysInMonth, monthBegin.dayOfWeek());
-      for (QValueList<int>::ConstIterator id = dayList.begin();  id != dayList.end();  ++id) {
+      for (Q3ValueList<int>::ConstIterator id = dayList.begin();  id != dayList.end();  ++id) {
         if (*id >= earliestDay)
           return monthBegin.addDays(*id - 1);
@@ -3225,5 +3228,5 @@ QDate Recurrence::getLastDateInMonth(const QDate &latestDate) const
     case rMonthlyDay: {
       int maxday = -1;
-      for (QPtrListIterator<int> it(rMonthDays);  it.current();  ++it) {
+      for (Q3PtrListIterator<int> it(rMonthDays);  it.current();  ++it) {
         int day = *it.current();
         if (day < 0)
@@ -3239,7 +3242,7 @@ QDate Recurrence::getLastDateInMonth(const QDate &latestDate) const
     case rYearlyPos: {
       QDate monthBegin(latestDate.addDays(1 - latestDay));
-      QValueList<int> dayList;
+      Q3ValueList<int> dayList;
       getMonthlyPosDays(dayList, daysInMonth, monthBegin.dayOfWeek());
-      for (QValueList<int>::ConstIterator id = dayList.fromLast();  id != dayList.end();  --id) {
+      for (Q3ValueList<int>::ConstIterator id = dayList.fromLast();  id != dayList.end();  --id) {
         if (*id <= latestDay)
           return monthBegin.addDays(*id - 1);
@@ -3257,5 +3260,5 @@ QDate Recurrence::getLastDateInMonth(const QDate &latestDate) const
 QDate Recurrence::getFirstDateInYear(const QDate &earliestDate) const
 {
-  QPtrListIterator<int> it(rYearNums);
+  Q3PtrListIterator<int> it(rYearNums);
   switch (recurs) {
     case rYearlyMonth: {
@@ -3293,5 +3296,5 @@ QDate Recurrence::getFirstDateInYear(const QDate &earliestDate) const
     }
     case rYearlyPos: {
-      QValueList<int> dayList;
+      Q3ValueList<int> dayList;
       int earliestYear  = earliestDate.year();
       int earliestMonth = earliestDate.month();
@@ -3302,5 +3305,5 @@ QDate Recurrence::getFirstDateInYear(const QDate &earliestDate) const
           QDate monthBegin(earliestYear, month, 1);
           getMonthlyPosDays(dayList, monthBegin.daysInMonth(), monthBegin.dayOfWeek());
-          for (QValueList<int>::ConstIterator id = dayList.begin();  id != dayList.end();  ++id) {
+          for (Q3ValueList<int>::ConstIterator id = dayList.begin();  id != dayList.end();  ++id) {
             if (*id >= earliestDay)
               return monthBegin.addDays(*id - 1);
@@ -3330,5 +3333,5 @@ QDate Recurrence::getFirstDateInYear(const QDate &earliestDate) const
 QDate Recurrence::getLastDateInYear(const QDate &latestDate) const
 {
-  QPtrListIterator<int> it(rYearNums);
+  Q3PtrListIterator<int> it(rYearNums);
   switch (recurs) {
     case rYearlyMonth: {
@@ -3365,5 +3368,5 @@ QDate Recurrence::getLastDateInYear(const QDate &latestDate) const
     }
     case rYearlyPos: {
-      QValueList<int> dayList;
+      Q3ValueList<int> dayList;
       int latestYear  = latestDate.year();
       int latestMonth = latestDate.month();
@@ -3374,5 +3377,5 @@ QDate Recurrence::getLastDateInYear(const QDate &latestDate) const
           QDate monthBegin(latestYear, month, 1);
           getMonthlyPosDays(dayList, monthBegin.daysInMonth(), monthBegin.dayOfWeek());
-          for (QValueList<int>::ConstIterator id = dayList.fromLast();  id != dayList.end();  --id) {
+          for (Q3ValueList<int>::ConstIterator id = dayList.fromLast();  id != dayList.end();  --id) {
             if (*id <= latestDay)
               return monthBegin.addDays(*id - 1);
diff --git a/libkcal/recurrence.h b/libkcal/recurrence.h
index b13d14f..5b5aab1 100644
--- a/libkcal/recurrence.h
+++ b/libkcal/recurrence.h
@@ -25,5 +25,7 @@
 #include <qstring.h>
 #include <qbitarray.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 namespace KCal {
@@ -249,7 +251,7 @@ class Recurrence
     void addMonthlyDay(short _rDay);
     /** Returns list of day positions in months. */
-    const QPtrList<rMonthPos> &monthPositions() const;
+    const Q3PtrList<rMonthPos> &monthPositions() const;
     /** Returns list of day numbers of a  month. */
-    const QPtrList<int> &monthDays() const;
+    const Q3PtrList<int> &monthDays() const;
 
     /** Sets an event to recur yearly.
@@ -280,7 +282,7 @@ class Recurrence
     void addYearlyMonthPos(short _rPos, const QBitArray &_rDays);
     /** Returns positions of days or months in year. */
-    const QPtrList<int> &yearNums() const;
+    const Q3PtrList<int> &yearNums() const;
     /** Returns list of day positions in months, for a recursYearlyPos recurrence rule. */
-    const QPtrList<rMonthPos> &yearMonthPositions() const;
+    const Q3PtrList<rMonthPos> &yearMonthPositions() const;
     /** Returns how yearly recurrences of February 29th are handled. */
     Feb29Type feb29YearlyType() const  { return mFeb29YearlyType; }
@@ -295,6 +297,6 @@ class Recurrence
     void dump() const;
     QString recurrenceText() const;
-    bool getYearlyMonthMonths(int day, QValueList<int>&,
-                              QValueList<int> &leaplist) const;
+    bool getYearlyMonthMonths(int day, Q3ValueList<int>&,
+                              Q3ValueList<int> &leaplist) const;
 
   protected:
@@ -346,7 +348,7 @@ class Recurrence
 
     int  countMonthlyPosDays() const;
-    void getMonthlyPosDays(QValueList<int>&, int daysInMonth,
+    void getMonthlyPosDays(Q3ValueList<int>&, int daysInMonth,
                            int startDayOfWeek) const;
-    bool getMonthlyDayDays(QValueList<int>&, int daysInMonth) const;
+    bool getMonthlyDayDays(Q3ValueList<int>&, int daysInMonth) const;
 
     int   getFirstDayInWeek(int startDay, bool useWeekStart = true) const;
@@ -367,11 +369,11 @@ class Recurrence
     QBitArray rDays;                     // array of days during week it recurs
 
-    QPtrList<rMonthPos> rMonthPositions; // list of positions during a month
+    Q3PtrList<rMonthPos> rMonthPositions; // list of positions during a month
                                          // on which an event recurs
 
-    QPtrList<int> rMonthDays;            // list of days during a month on
+    Q3PtrList<int> rMonthDays;            // list of days during a month on
                                          // which the event recurs
 
-    QPtrList<int> rYearNums;             // either months/days to recur on for rYearly,
+    Q3PtrList<int> rYearNums;             // either months/days to recur on for rYearly,
                                          // sorted in numerical order
 
diff --git a/libkcal/scheduler.cpp b/libkcal/scheduler.cpp
index 253d8b7..234cfcf 100644
--- a/libkcal/scheduler.cpp
+++ b/libkcal/scheduler.cpp
@@ -21,5 +21,7 @@
 #include <qdir.h>
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 #include <klocale.h>
@@ -265,6 +267,6 @@ bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::Status sta
     //get matching attendee in calendar
     kdDebug(5800) << "Scheduler::acceptTransaction match found!" << endl;
-    QPtrList<Attendee> attendeesIn = incidence->attendees();
-    QPtrList<Attendee> attendeesEv;
+    Q3PtrList<Attendee> attendeesIn = incidence->attendees();
+    Q3PtrList<Attendee> attendeesEv;
     if (ev) attendeesEv = ev->attendees();
     if (to) attendeesEv = to->attendees();
@@ -343,9 +345,9 @@ bool Scheduler::acceptFreeBusy(IncidenceBase *incidence, Method method)
   QString messageText = mFormat->createScheduleMessage(freebusy, Publish);
 
-  if (!f.open(IO_ReadWrite)) {
+  if (!f.open(QIODevice::ReadWrite)) {
    kdDebug() << "acceptFreeBusy: Can't open:" << filename << " for writing" << endl;
    return false;
   }
-  QTextStream t(&f);
+  Q3TextStream t(&f);
   t << messageText;
   f.close();
diff --git a/libkcal/scheduler.h b/libkcal/scheduler.h
index a9f43b9..357e98e 100644
--- a/libkcal/scheduler.h
+++ b/libkcal/scheduler.h
@@ -24,5 +24,5 @@
 
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 namespace KCal {
@@ -96,5 +96,5 @@ class Scheduler {
     virtual bool performTransaction(IncidenceBase *incidence,Method method,const QString &recipients) = 0;
     /** Retrieve incoming iTIP transactions */
-    virtual QPtrList<ScheduleMessage> retrieveTransactions() = 0;
+    virtual Q3PtrList<ScheduleMessage> retrieveTransactions() = 0;
 
     /**
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp
index 9b757f7..b8c2aa7 100644
--- a/libkcal/sharpformat.cpp
+++ b/libkcal/sharpformat.cpp
@@ -23,10 +23,10 @@
 #include <qstring.h>
 #include <qapplication.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qregexp.h>
 #include <qmessagebox.h>
 #include <qclipboard.h>
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
 #include <qxml.h>
@@ -367,9 +367,9 @@ bool SharpFormat::load( Calendar *calendar, Calendar *existngCal )
     }  
     QFile file( fileName );
-    if (!file.open( IO_ReadOnly ) ) {
+    if (!file.open( QIODevice::ReadOnly ) ) {
         return false;
         
     } 
-    QTextStream ts( &file );
+    Q3TextStream ts( &file );
     ts.setCodec( QTextCodec::codecForName("utf8") );
     text = ts.read();
@@ -389,5 +389,5 @@ bool SharpFormat::load( Calendar *calendar, Calendar *existngCal )
     } 
     file.setName( fileName );
-    if (!file.open( IO_ReadOnly ) ) {
+    if (!file.open( QIODevice::ReadOnly ) ) {
         return false;
         
@@ -476,5 +476,5 @@ bool SharpFormat::save( Calendar *calendar)
     QString tPrefix = "CARDID,CATEGORY,ETDY,LTDY,FNDY,MARK,PRTY,TITL,MEM1\n";
     QString command;
-    QPtrList<Event> er = calendar->rawEvents(); 
+    Q3PtrList<Event> er = calendar->rawEvents(); 
     Event* ev = er.first();
     QString  fileName = "/tmp/kopitempout";
@@ -504,8 +504,8 @@ bool SharpFormat::save( Calendar *calendar)
                 QString fileNameIn = "/tmp/kopitempin";
                 QFile fileIn( fileNameIn );
-                if (!fileIn.open( IO_WriteOnly ) ) {
+                if (!fileIn.open( QIODevice::WriteOnly ) ) {
                     return false;
                 } 
-                QTextStream tsIn( &fileIn );
+                Q3TextStream tsIn( &fileIn );
                 tsIn.setCodec( QTextCodec::codecForName("utf8") );
                 tsIn << ePrefix << eString ;
@@ -518,9 +518,9 @@ bool SharpFormat::save( Calendar *calendar)
                 system (  command.utf8() );
                 QFile file( fileName );
-                if (!file.open( IO_ReadOnly ) ) {
+                if (!file.open( QIODevice::ReadOnly ) ) {
                     return false;
                     
                 } 
-                QTextStream ts( &file );
+                Q3TextStream ts( &file );
                 ts.setCodec( QTextCodec::codecForName("utf8") );
                 answer = ts.read();
@@ -545,9 +545,9 @@ bool SharpFormat::save( Calendar *calendar)
     if ( changeEnt ) {
         QFile file( fileName );
-        if (!file.open( IO_WriteOnly ) ) {
+        if (!file.open( QIODevice::WriteOnly ) ) {
             return false;
             
         } 
-        QTextStream ts( &file );
+        Q3TextStream ts( &file );
         ts.setCodec( QTextCodec::codecForName("utf8") );
         ts << changeString ;
@@ -563,9 +563,9 @@ bool SharpFormat::save( Calendar *calendar)
     if ( deleteEnt  ) {
         QFile file( fileName );
-        if (!file.open( IO_WriteOnly ) ) {
+        if (!file.open( QIODevice::WriteOnly ) ) {
             return false;
             
         } 
-        QTextStream ts( &file );
+        Q3TextStream ts( &file );
         ts.setCodec( QTextCodec::codecForName("utf8") );
         ts << deleteString;
@@ -581,5 +581,5 @@ bool SharpFormat::save( Calendar *calendar)
     status.setText ( i18n("Processing todos ...") );
     qApp->processEvents();
-    QPtrList<Todo> tl = calendar->rawTodos(); 
+    Q3PtrList<Todo> tl = calendar->rawTodos(); 
     Todo* to = tl.first();
     i = 0;
@@ -606,8 +606,8 @@ bool SharpFormat::save( Calendar *calendar)
                 QString fileNameIn = "/tmp/kopitempin";
                 QFile fileIn( fileNameIn );
-                if (!fileIn.open( IO_WriteOnly ) ) {
+                if (!fileIn.open( QIODevice::WriteOnly ) ) {
                     return false;
                 } 
-                QTextStream tsIn( &fileIn );
+                Q3TextStream tsIn( &fileIn );
                 tsIn.setCodec( QTextCodec::codecForName("utf8") );
                 tsIn << tPrefix << eString ;
@@ -616,8 +616,8 @@ bool SharpFormat::save( Calendar *calendar)
                 system (  command.utf8() );
                 QFile file( fileName );
-                if (!file.open( IO_ReadOnly ) ) {
+                if (!file.open( QIODevice::ReadOnly ) ) {
                     return false;
                 } 
-                QTextStream ts( &file );
+                Q3TextStream ts( &file );
                 ts.setCodec( QTextCodec::codecForName("utf8") );
                 answer = ts.read();
@@ -643,9 +643,9 @@ bool SharpFormat::save( Calendar *calendar)
     if ( changeEnt ) {
         QFile file( fileName );
-        if (!file.open( IO_WriteOnly ) ) {
+        if (!file.open( QIODevice::WriteOnly ) ) {
             return false;
             
         } 
-        QTextStream ts( &file );
+        Q3TextStream ts( &file );
         ts.setCodec( QTextCodec::codecForName("utf8") );
         ts << changeString ;
@@ -661,9 +661,9 @@ bool SharpFormat::save( Calendar *calendar)
     if ( deleteEnt  ) {
         QFile file( fileName );
-        if (!file.open( IO_WriteOnly ) ) {
+        if (!file.open( QIODevice::WriteOnly ) ) {
             return false;
             
         } 
-        QTextStream ts( &file );
+        Q3TextStream ts( &file );
         ts.setCodec( QTextCodec::codecForName("utf8") );
         ts << deleteString;
@@ -784,5 +784,5 @@ QString SharpFormat::getEventString( Event* event )
             {
                 int count = 1;
-                QPtrList<Recurrence::rMonthPos> rmp;
+                Q3PtrList<Recurrence::rMonthPos> rmp;
                 rmp = rec->monthPositions();
                 if ( rmp.first()->negative )
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index cc1c5ae..5a0c32e 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -624,5 +624,5 @@ QDateTime Todo::getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_d
 //          return incidenceStart;
 //      }
-     for (QPtrListIterator<Alarm> it(mAlarms); (alarm = it.current()) != 0; ++it) {
+     for (Q3PtrListIterator<Alarm> it(mAlarms); (alarm = it.current()) != 0; ++it) {
          if (alarm->enabled()) {
              if ( alarm->hasTime () ) {
diff --git a/libkcal/todo.h b/libkcal/todo.h
index 2131732..cea976c 100644
--- a/libkcal/todo.h
+++ b/libkcal/todo.h
@@ -27,4 +27,6 @@
 
 #include <qtimer.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 namespace KCal {
@@ -41,5 +43,5 @@ namespace KCal {
     ~Todo();
     typedef ListBase<Todo> List;
-    QCString type() const { return "Todo"; }
+    Q3CString type() const { return "Todo"; }
     IncTypeID typeID() const { return todoID; }
 
diff --git a/libkcal/vcaldrag.cpp b/libkcal/vcaldrag.cpp
index f01f332..324981e 100644
--- a/libkcal/vcaldrag.cpp
+++ b/libkcal/vcaldrag.cpp
@@ -27,5 +27,5 @@ using namespace KCal;
 
 VCalDrag::VCalDrag( Calendar *cal, QWidget *parent, const char *name )
-  : QStoredDrag( "text/x-vCalendar", parent, name )
+  : Q3StoredDrag( "text/x-vCalendar", parent, name )
 {
   VCalFormat format;
diff --git a/libkcal/vcaldrag.h b/libkcal/vcaldrag.h
index 3048124..68a320d 100644
--- a/libkcal/vcaldrag.h
+++ b/libkcal/vcaldrag.h
@@ -23,5 +23,5 @@
 #define VCALDRAG_H
 
-#include <qdragobject.h>
+#include <q3dragobject.h>
 
 
@@ -31,5 +31,5 @@ class Calendar;
 
 /** vCalendar drag&drop class. */
-class VCalDrag : public QStoredDrag {
+class VCalDrag : public Q3StoredDrag {
   public:
     /** Create a drag&drop object for vCalendar component \a vcal. */
diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp
index 2e19740..9cbaf16 100644
--- a/libkcal/vcalformat.cpp
+++ b/libkcal/vcalformat.cpp
@@ -23,9 +23,11 @@
 #include <qdatetime.h>
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qregexp.h>
 #include <qclipboard.h>
 #include <qdialog.h>
 #include <qfile.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include <kdebug.h>
@@ -109,6 +111,6 @@ 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) {
     vo = eventToVTodo(qlt.current());
@@ -117,5 +119,5 @@ bool VCalFormat::save(Calendar *calendar, const QString &fileName)
 
   // EVENT STUFF
-  QPtrList<Event> events = mCalendar->rawEvents();
+  Q3PtrList<Event> events = mCalendar->rawEvents();
   Event *ev;
   for(ev=events.first();ev;ev=events.next()) {
@@ -139,5 +141,5 @@ bool VCalFormat::fromString( Calendar *calendar, const QString &text )
   // TODO: Factor out VCalFormat::fromString()
 
-  QCString data = text.utf8();
+  Q3CString data = text.utf8();
 
   if ( !data.size() ) return false;
@@ -211,5 +213,5 @@ QString VCalFormat::toString( Calendar *calendar )
 
   // TODO: Use all data.
-  QPtrList<Event> events = calendar->events();
+  Q3PtrList<Event> events = calendar->events();
   Event *event = events.first();
   if ( !event ) return QString::null;
@@ -272,6 +274,6 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
   // attendees
   if (anEvent->attendeeCount() != 0) {
-    QPtrList<Attendee> al = anEvent->attendees();
-    QPtrListIterator<Attendee> ai(al);
+    Q3PtrList<Attendee> al = anEvent->attendees();
+    Q3PtrListIterator<Attendee> ai(al);
     Attendee *curAttendee;
 
@@ -327,5 +329,5 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
 
   // related event
-  if (anEvent->relatedToUid()) {
+  if (!anEvent->relatedToUid().isEmpty()) {
     addPropValue(vtodo, VCRelatedToProp,
                  anEvent->relatedToUid().local8Bit());
@@ -356,5 +358,5 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
   // alarm stuff
   kdDebug(5800) << "vcalformat::eventToVTodo was called" << endl;
-  QPtrList<Alarm> alarms = anEvent->alarms();
+  Q3PtrList<Alarm> alarms = anEvent->alarms();
   Alarm* alarm;
   for (alarm = alarms.first(); alarm; alarm = alarms.next()) {
@@ -434,6 +436,6 @@ 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;
 
@@ -462,6 +464,6 @@ VObject* VCalFormat::eventToVEvent(Event *anEvent)
   if (anEvent->doesRecur()) {
     // some more variables
-    QPtrList<Recurrence::rMonthPos> tmpPositions;
-    QPtrList<int> tmpDays;
+    Q3PtrList<Recurrence::rMonthPos> tmpPositions;
+    Q3PtrList<int> tmpDays;
     int *tmpDay;
     Recurrence::rMonthPos *tmpPos;
@@ -546,5 +548,5 @@ VObject* VCalFormat::eventToVEvent(Event *anEvent)
       tmpStr += "#0"; // defined as repeat forever
     } else {
-      tmpStr += qDateTimeToISO(anEvent->recurrence()->endDate(), FALSE);
+      tmpStr += qDateTimeToISO((QDateTime)anEvent->recurrence()->endDate(), FALSE);
     }
     addPropValue(vevent,VCRRuleProp, tmpStr.local8Bit());
@@ -626,5 +628,5 @@ VObject* VCalFormat::eventToVEvent(Event *anEvent)
   // attachments 
   // TODO: handle binary attachments!
-  QPtrList<Attachment> attachments = anEvent->attachments();
+  Q3PtrList<Attachment> attachments = anEvent->attachments();
   for ( Attachment *at = attachments.first(); at; at = attachments.next() )
     addPropValue(vevent, VCAttachProp, at->uri().local8Bit());
@@ -637,5 +639,5 @@ VObject* VCalFormat::eventToVEvent(Event *anEvent)
 
   // alarm stuff
-  QPtrList<Alarm> alarms = anEvent->alarms();
+  Q3PtrList<Alarm> alarms = anEvent->alarms();
   Alarm* alarm;
   for (alarm = alarms.first(); alarm; alarm = alarms.next()) {
@@ -673,5 +675,5 @@ VObject* VCalFormat::eventToVEvent(Event *anEvent)
 
   // related event
-  if (anEvent->relatedToUid()) {
+  if (!anEvent->relatedToUid().isEmpty()) {
     addPropValue(vevent, VCRelatedToProp,
 	         anEvent->relatedToUid().local8Bit());
@@ -1409,5 +1411,5 @@ QString VCalFormat::qDateToISO(const QDate &qd)
   QString tmpStr;
 
-  ASSERT(qd.isValid());
+  Q_ASSERT(qd.isValid());
 
   tmpStr.sprintf("%.2d%.2d%.2d",
@@ -1421,6 +1423,6 @@ QString VCalFormat::qDateTimeToISO(const QDateTime &qdt, bool zulu)
   QString tmpStr;
 
-  ASSERT(qdt.date().isValid());
-  ASSERT(qdt.time().isValid());
+  Q_ASSERT(qdt.date().isValid());
+  Q_ASSERT(qdt.time().isValid());
   if (zulu && !useLocalTime ) {
     QDateTime tmpDT = qdt.addSecs ( -KGlobal::locale()->localTimeOffset( qdt )*60);
@@ -1455,6 +1457,6 @@ QDateTime VCalFormat::ISOToQDateTime(const QString & dtStr)
   tmpTime.setHMS(hour, minute, second);
 
-  ASSERT(tmpDate.isValid());
-  ASSERT(tmpTime.isValid());
+  Q_ASSERT(tmpDate.isValid());
+  Q_ASSERT(tmpTime.isValid());
   QDateTime tmpDT(tmpDate, tmpTime);
   // correct for GMT if string is in Zulu format
@@ -1649,5 +1651,5 @@ Attendee::Role VCalFormat::readRole(const char *s) const
 }
 
-QCString VCalFormat::writeRole(Attendee::Role role) const
+Q3CString VCalFormat::writeRole(Attendee::Role role) const
 {
     if ( role == Attendee::Chair )
@@ -1687,5 +1689,5 @@ Attendee::PartStat VCalFormat::readStatus(const char *s) const
 }
 
-QCString VCalFormat::writeStatus(Attendee::PartStat status) const
+Q3CString VCalFormat::writeStatus(Attendee::PartStat status) const
 {
   switch(status) {
diff --git a/libkcal/vcalformat.h b/libkcal/vcalformat.h
index 6dae3d2..cac9634 100644
--- a/libkcal/vcalformat.h
+++ b/libkcal/vcalformat.h
@@ -24,4 +24,7 @@
 
 #include "calformat.h"
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3PtrList>
 
 #define _VCAL_VERSION "1.0"
@@ -96,8 +99,8 @@ class VCalFormat : public CalFormat {
     /** the reverse of the above function. */
     int numFromDay(const QString &day);
-    Attendee::Role VCalFormat::readRole(const char *s) const;
-    QCString writeRole(Attendee::Role role) const;
+    Attendee::Role readRole(const char *s) const;
+    Q3CString writeRole(Attendee::Role role) const;
     Attendee::PartStat readStatus(const char *s) const;
-    QCString writeStatus(Attendee::PartStat status) const;
+    Q3CString writeStatus(Attendee::PartStat status) const;
   
   private:
@@ -105,6 +108,6 @@ class VCalFormat : public CalFormat {
     bool useLocalTime;
   
-    QPtrList<Event> mEventsRelate;           // events with relations
-    QPtrList<Todo> mTodosRelate;             // todos with relations
+    Q3PtrList<Event> mEventsRelate;           // events with relations
+    Q3PtrList<Todo> mTodosRelate;             // todos with relations
 };