1 files changed, 20 insertions, 18 deletions

diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 7dd9bd2..8fcdc69 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -21,16 +21,18 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
 
 #include "calformat.h"
 
 #include "incidence.h"
 #include "todo.h"
+//Added by qt3to4:
+#include <Q3PtrList>
 
 using namespace KCal;
 
 Incidence::Incidence() :
   IncidenceBase(),
   mRelatedTo(0), mSecrecy(SecrecyPublic), mPriority(3)
 {
     mRecurrence = 0;//new Recurrence(this);
@@ -54,31 +56,31 @@ Incidence::Incidence( const Incidence &i ) : IncidenceBase( i )
   mDescription = i.mDescription;
   mSummary = i.mSummary;
   mCategories = i.mCategories;
 //  Incidence *mRelatedTo;          Incidence *mRelatedTo;
   mRelatedTo = 0;
   mRelatedToUid = i.mRelatedToUid; 
 //  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()) ) {
       Attachment *a = new Attachment( *at );
       mAttachments.append( a );
       ++itat;
   }
   mAttachments.setAutoDelete( true );
   mResources = i.mResources;
   mSecrecy = i.mSecrecy;
   mPriority = i.mPriority;
   mLocation = i.mLocation;
   mCancelled = i.mCancelled;
   mHasStartDate = i.mHasStartDate;
-  QPtrListIterator<Alarm> it( i.mAlarms );
+  Q3PtrListIterator<Alarm> it( i.mAlarms );
   const Alarm *a;
   while( (a = it.current()) ) {
     Alarm *b = new Alarm( *a );
     b->setParent( this );
     mAlarms.append( b );
 
     ++it;
   }
@@ -93,17 +95,17 @@ Incidence::Incidence( const Incidence &i ) : IncidenceBase( i )
   mBirthday = i.mBirthday;
   mAnniversary = i.mAnniversary;
 }
 
 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);
   } 
   if (relatedTo()) relatedTo()->removeRelation(this);
   if ( mRecurrence ) 
       delete mRecurrence; 
  
 }
@@ -211,18 +213,18 @@ bool KCal::operator==( const Incidence& i1, const Incidence& i2 )
     if ( i1.alarms().count() > 0 ) {
         if ( !( *(i1.alarms().first()) == *(i2.alarms().first())) ) 
             {
             qDebug("alarm not equal ");
             return false;
         }
     }
 #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() ) {
             continue;
         }
         else {
             return false;
         }
     }
@@ -317,17 +319,17 @@ void Incidence::recreate()
   setIDStr( ":" );
   setLastModified(QDateTime::currentDateTime());
 }
 void Incidence::cloneRelations( Incidence * newInc )
 {
     // newInc is already a clone of this incidence
     Incidence * inc;
     Incidence * cloneInc;
-    QPtrList<Incidence> Relations = relations();
+    Q3PtrList<Incidence> Relations = relations();
     for (inc=Relations.first();inc;inc=Relations.next()) {
         cloneInc = inc->clone();
         cloneInc->recreate();
         cloneInc->setRelatedTo( newInc );
         inc->cloneRelations( cloneInc );
     } 
 }
 void Incidence::setReadOnly( bool readOnly )
@@ -351,17 +353,17 @@ QString Incidence::lastModifiedSubSortKey() const
 QDateTime Incidence::lastModifiedSub()
 {
     if ( !mRelations.count() )
         return lastModified();
     if ( mLastModifiedSub.isValid() )
         return mLastModifiedSub;
     mLastModifiedSub = lastModified();
     Incidence * inc;
-    QPtrList<Incidence> Relations = relations();
+    Q3PtrList<Incidence> Relations = relations();
     for (inc=Relations.first();inc;inc=Relations.next()) {
         if ( inc->lastModifiedSub() > mLastModifiedSub )
             mLastModifiedSub = inc->lastModifiedSub();
     }
     mLastModifiedSubSortKey.sprintf("%04d%02d%02d%02d%02d%02d",
                                     mLastModifiedSub.date().year(),
                                     mLastModifiedSub.date().month(),
                                     mLastModifiedSub.date().day(),
@@ -442,32 +444,32 @@ void Incidence::addCategories(const QStringList &categories, bool addToRelations
     for( i = 0; i < categories.count(); ++i ) {
         if (  !mCategories.contains (categories[i]))
             mCategories.append( categories[i] );
     }
     checkCategories();
     updated();
     if ( addToRelations ) {
         Incidence * inc;
-        QPtrList<Incidence> Relations = relations();
+        Q3PtrList<Incidence> Relations = relations();
         for (inc=Relations.first();inc;inc=Relations.next()) {
             inc->addCategories( categories, true );
         } 
     }
 }
 
 void Incidence::setCategories(const QStringList &categories, bool setForRelations ) //setForRelations = false
 {
   if (mReadOnly) return;
   mCategories = categories;
   checkCategories();
   updated();
   if ( setForRelations ) {
       Incidence * inc;
-      QPtrList<Incidence> Relations = relations();
+      Q3PtrList<Incidence> Relations = relations();
       for (inc=Relations.first();inc;inc=Relations.next()) {
           inc->setCategories( categories, true );
       } 
   }
 }
 
 // TODO: remove setCategories(QString) function
 void Incidence::setCategories(const QString &catStr)
@@ -545,25 +547,25 @@ void Incidence::setRelatedTo(Incidence *relatedTo)
   }
 }
 
 Incidence *Incidence::relatedTo() const
 {
   return mRelatedTo;
 }
 
-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 );
     } 
     if ( rel->findRef( this ) == -1 ) 
         rel->append( this );
 }
 
 void Incidence::addRelation(Incidence *event)
@@ -642,25 +644,25 @@ void Incidence::deleteAttachments(const QString& mime)
   while (at) {
     if (at->mimeType() == mime)
       mAttachments.remove();
     else
       at = mAttachments.next();
   }
 }
 
-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()) ) {
     if (at->mimeType() == mime)
       attachments.append(at);
     ++it;
   }
 
   return attachments;
@@ -732,17 +734,17 @@ QStringList Incidence::secrecyList()
   list << secrecyName(SecrecyPublic);
   list << secrecyName(SecrecyPrivate);
   list << secrecyName(SecrecyConfidential);
 
   return list;
 }
 
 
-QPtrList<Alarm> Incidence::alarms() const
+Q3PtrList<Alarm> Incidence::alarms() const
 {
   return mAlarms;
 }
 
 Alarm* Incidence::newAlarm()
 {
   Alarm* alarm = new Alarm(this);
   mAlarms.append(alarm);
@@ -766,17 +768,17 @@ void Incidence::clearAlarms()
 {
   mAlarms.clear();
   updated();
 }
 
 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;
   }
   return false;
 }
 #include <stdlib.h>
 Recurrence *Incidence::recurrence()
 {