fixxx

6 files changed, 50 insertions, 27 deletions

diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp
index b7990d4..b1806ee 100644
--- a/libkcal/calendar.cpp
+++ b/libkcal/calendar.cpp
@@ -1,243 +1,262 @@
 /*
     This file is part of libkcal.
     Copyright (c) 1998 Preston Brown
     Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <stdlib.h>
 #include <time.h>
 
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
 
 #include "exceptions.h"
 #include "calfilter.h"
 
 #include "calendar.h"
 #include "syncdefines.h"
 
 using namespace KCal;
 
 Calendar::Calendar()
 {
   
   init();
   setTimeZoneId( " 00:00 Europe/London(UTC)" );
 }
 
 Calendar::Calendar( const QString &timeZoneId )
 { 
 
     init();
     setTimeZoneId(timeZoneId);
 }
 
 void Calendar::init()
 {
   mObserver = 0;
   mNewObserver = false;
   mUndoIncidence = 0;
   mDeleteIncidencesOnClose = true;
   mModified = false;
   mDefaultCalendar = 1;
   // Setup default filter, which does nothing
   mDefaultFilter = new CalFilter;
   mFilter = mDefaultFilter;
   mFilter->setEnabled(false);
 
   // initialize random numbers.  This is a hack, and not
   // even that good of one at that.
 //  srandom(time(0));
 
   // user information...
   setOwner(i18n("Unknown Name"));
   setEmail(i18n("unknown@nowhere"));
 
 #if 0
   tmpStr = KOPrefs::instance()->mTimeZone;
 //  kdDebug(5800) << "Calendar::Calendar(): TimeZone: " << tmpStr << endl;
   int dstSetting = KOPrefs::instance()->mDaylightSavings;
   extern long int timezone;
   struct tm *now;
   time_t curtime;
   curtime = time(0);
   now = localtime(&curtime);
   int hourOff = - ((timezone / 60) / 60);
   if (now->tm_isdst)
     hourOff += 1;
   QString tzStr;
   tzStr.sprintf("%.2d%.2d",
                 hourOff,
                 abs((timezone / 60) % 60));
 
   // if no time zone was in the config file, write what we just discovered.
   if (tmpStr.isEmpty()) {
 //    KOPrefs::instance()->mTimeZone = tzStr;
   } else {
     tzStr = tmpStr;
   }
 
   // if daylight savings has changed since last load time, we need
   // to rewrite these settings to the config file.
   if ((now->tm_isdst && !dstSetting) ||
       (!now->tm_isdst && dstSetting)) {
     KOPrefs::instance()->mTimeZone = tzStr;
     KOPrefs::instance()->mDaylightSavings = now->tm_isdst;
   }
 
   setTimeZone(tzStr);
 #endif
 
 //  KOPrefs::instance()->writeConfig();
 }
 
 Calendar::~Calendar()
 {
   delete mDefaultFilter;
-  if ( mUndoIncidence )
-      delete mUndoIncidence;
-}
+  clearUndo( 0 );
+} 
+void Calendar::clearUndo( Incidence * newUndo )
+{
+    
+    if ( mUndoIncidence ) {
+        if ( mUndoIncidence->typeID() == eventID )
+            delete  ((Event*) mUndoIncidence) ;
+        else if ( mUndoIncidence->typeID() == todoID )
+            delete ( (Todo*) mUndoIncidence );
+        else if ( mUndoIncidence->typeID() == journalID )
+            delete ( (Journal*) mUndoIncidence );
+        else 
+            delete mUndoIncidence;
+    }
+    mUndoIncidence =  newUndo;
+    if ( mUndoIncidence ) {
+        mUndoIncidence->clearRelations();
+    }
+    
+}   
+
 void Calendar::setDontDeleteIncidencesOnClose ()
 {
     mDeleteIncidencesOnClose = false;
 }
 void Calendar::setDefaultCalendar( int d )
 {
     mDefaultCalendar = d;
 }
 int Calendar::defaultCalendar()
 {
     return mDefaultCalendar;
 }
 const QString &Calendar::getOwner() const
 {
   return mOwner;
 }
 
 bool Calendar::undoDeleteIncidence()
 {
     if (!mUndoIncidence)
         return false;
     addIncidence(mUndoIncidence);
     mUndoIncidence = 0;
     return true;
 }
 void Calendar::setOwner(const QString &os)
 {
   int i;
   mOwner = os;
   i = mOwner.find(',');
   if (i != -1)
     mOwner = mOwner.left(i);
 
   setModified( true );
 }
 
 void Calendar::setTimeZone(const QString & tz)
 {
   bool neg = FALSE;
   int hours, minutes;
   QString tmpStr(tz);
 
   if (tmpStr.left(1) == "-")
     neg = TRUE;
   if (tmpStr.left(1) == "-" || tmpStr.left(1) == "+")
     tmpStr.remove(0, 1);
   hours = tmpStr.left(2).toInt();
   if (tmpStr.length() > 2)
     minutes = tmpStr.right(2).toInt();
   else
     minutes = 0;
   mTimeZone = (60*hours+minutes);
   if (neg)
     mTimeZone = -mTimeZone;
   mLocalTime = false;
 
   setModified( true );
 }
 
 QString Calendar::getTimeZoneStr() const
 {
   if (mLocalTime)
     return "";
   QString tmpStr;
   int hours = abs(mTimeZone / 60);
   int minutes = abs(mTimeZone % 60);
   bool neg = mTimeZone < 0;
 
   tmpStr.sprintf("%c%.2d%.2d",
                  (neg ? '-' : '+'),
                  hours, minutes);
   return tmpStr;
 }
 
 void Calendar::setTimeZone(int tz)
 {
   mTimeZone = tz;
   mLocalTime = false;
 
   setModified( true );
 }
 
 int Calendar::getTimeZone() const
 {
   return mTimeZone;
 }
 
 void Calendar::setTimeZoneId(const QString &id)
 { 
     mTimeZoneId = id;
     mLocalTime = false;
     mTimeZone  = KGlobal::locale()->timezoneOffset(mTimeZoneId);
     if ( mTimeZone > 1000)
          setLocalTime();
     //qDebug("Calendar::setTimeZoneOffset %s %d ",mTimeZoneId.latin1(), mTimeZone);
     setModified( true );
 }
 
 QString Calendar::timeZoneId() const
 {
   return mTimeZoneId;
 }
 
 void Calendar::setLocalTime()
 { 
     //qDebug("Calendar::setLocalTime() ");
     mLocalTime = true;
     mTimeZone = 0;
     mTimeZoneId = "";
 
   setModified( true );
 }
 
 bool Calendar::isLocalTime() const
 {
   return mLocalTime;
 }
 
 const QString &Calendar::getEmail()
 {
   return mOwnerEmail;
 }
 
 void Calendar::setEmail(const QString &e)
 {
   mOwnerEmail = e;
 
   setModified( true );
@@ -322,168 +341,183 @@ QPtrList<Incidence> Calendar::rawIncidences()
 QPtrList<Event> Calendar::events( const QDate &date, bool sorted )
 {
   QPtrList<Event> el = rawEventsForDate(date,sorted);
   mFilter->apply(&el);
   return el;
 }
 
 QPtrList<Event> Calendar::events( const QDateTime &qdt )
 {
   QPtrList<Event> el = rawEventsForDate(qdt);
   mFilter->apply(&el);
   return el;
 }
 
 QPtrList<Event> Calendar::events( const QDate &start, const QDate &end,
                                   bool inclusive)
 {
   QPtrList<Event> el = rawEvents(start,end,inclusive);
   mFilter->apply(&el);
   return el;
 }
 
 QPtrList<Event> Calendar::events()
 {
   QPtrList<Event> el = rawEvents();
   mFilter->apply(&el);
   return el;
 }
 void Calendar::addIncidenceBranch(Incidence *i)
 {
     addIncidence( i );
     Incidence * inc;
     QPtrList<Incidence> Relations = i->relations();
     for (inc=Relations.first();inc;inc=Relations.next()) {
        addIncidenceBranch( inc );
     } 
 }
 
 bool Calendar::addIncidence(Incidence *i)
 {
   Incidence::AddVisitor<Calendar> v(this);
   if ( i->calID() == 0 )
       i->setCalID( mDefaultCalendar );
   i->setCalEnabled( true );
   return i->accept(v);
 }
 void Calendar::deleteIncidence(Incidence *in)
 {
     if ( in->typeID() == eventID )
         deleteEvent( (Event*) in );
     else if ( in->typeID() == todoID )
         deleteTodo( (Todo*) in);
     else if ( in->typeID() == journalID )
         deleteJournal( (Journal*) in );
 }
 
 Incidence* Calendar::incidence( const QString& uid )
 {
   Incidence* i;
 
   if( (i = todo( uid )) != 0 )
     return i;
   if( (i = event( uid )) != 0 )
     return i;
   if( (i = journal( uid )) != 0 )
       return i;
 
   return 0;
 }
 
 QPtrList<Todo> Calendar::todos()
 {
   QPtrList<Todo> tl = rawTodos();
   mFilter->apply( &tl );
   return tl;
 }
 
 // When this is called, the todo have already been added to the calendar.
 // This method is only about linking related todos
 void Calendar::setupRelations( Incidence *incidence )
 {
   QString uid = incidence->uid();
   //qDebug("Calendar::setupRelations ");
   // First, go over the list of orphans and see if this is their parent
   while( Incidence* i = mOrphans[ uid ] ) {
     mOrphans.remove( uid );
     i->setRelatedTo( incidence );
     incidence->addRelation( i );
     mOrphanUids.remove( i->uid() );
   }
 
   // Now see about this incidences parent
   if( !incidence->relatedTo() && !incidence->relatedToUid().isEmpty() ) {
     // This incidence has a uid it is related to, but is not registered to it yet
     // Try to find it
     Incidence* parent = this->incidence( incidence->relatedToUid() );
     if( parent ) {
       // Found it
       incidence->setRelatedTo( parent );
       parent->addRelation( incidence );
     } else {
       // Not found, put this in the mOrphans list
       mOrphans.insert( incidence->relatedToUid(), incidence );
       mOrphanUids.insert( incidence->uid(), incidence );
     }
   }
 }
 
 // If a task with subtasks is deleted, move it's subtasks to the orphans list
 void Calendar::removeRelations( Incidence *incidence )
 {
     // qDebug("Calendar::removeRelations ");
     QString uid = incidence->uid();
 
     QPtrList<Incidence> relations = incidence->relations();
     for( Incidence* i = relations.first(); i; i = relations.next() )
         if( !mOrphanUids.find( i->uid() ) ) {
             mOrphans.insert( uid, i );
             mOrphanUids.insert( i->uid(), i );
             i->setRelatedTo( 0 );
             i->setRelatedToUid( uid );
         }
 
     // If this incidence is related to something else, tell that about it
     if( incidence->relatedTo() )
         incidence->relatedTo()->removeRelation( incidence );
 
     // Remove this one from the orphans list
-    if( mOrphanUids.remove( uid ) )
+    if( mOrphanUids.remove( uid ) ) {
+        QString r2uid = incidence->relatedToUid();
+        QPtrList<Incidence> tempList;
+        while( Incidence* i = mOrphans[ r2uid ] ) {
+            mOrphans.remove( r2uid );
+            if ( i != incidence ) tempList.append( i );
+        }
+        Incidence* inc = tempList.first();
+        while ( inc ) {
+            mOrphans.insert( r2uid, inc );
+            inc = tempList.next();
+        }
+    }
+    // LR: and another big bad bug found
+#if 0
         // This incidence is located in the orphans list - it should be removed
         if( !( incidence->relatedTo() != 0 && mOrphans.remove( incidence->relatedTo()->uid() ) ) ) {
             // Removing wasn't that easy
             for( QDictIterator<Incidence> it( mOrphans ); it.current(); ++it ) {
                 if( it.current()->uid() == uid ) {
                     mOrphans.remove( it.currentKey() );
                     break;
                 }
             }
         }
+#endif
 }
 
 void Calendar::registerObserver( Observer *observer )
 {
   mObserver = observer;
   mNewObserver = true;
 }
 
 void Calendar::setModified( bool modified )
 {
     if ( mObserver ) mObserver->calendarModified( modified, this );
   if ( modified != mModified || mNewObserver ) {
     mNewObserver = false;
     // if ( mObserver ) mObserver->calendarModified( modified, this );
     mModified = modified;
   }
 }
 
 void Calendar::setLoadedProductId( const QString &id )
 {
   mLoadedProductId = id;
 }
 
 QString Calendar::loadedProductId()
 {
   return mLoadedProductId;
 }
 
 //#include "calendar.moc"
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index 95477cd..3f6895d 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -1,210 +1,211 @@
 /*
     This file is part of libkcal.
     Copyright (c) 1998 Preston Brown
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef CALENDAR_H
 #define CALENDAR_H
 
 #include <qobject.h>
 #include <qstring.h>
 #include <qdatetime.h>
 #include <qptrlist.h>
 #include <qdict.h>
 
 #include "customproperties.h"
 #include "event.h"
 #include "todo.h"
 #include "journal.h"
 #include "calfilter.h"
 
 //#define _TIME_ZONE "-0500" /* hardcoded, overridden in config file. */
 
 class KConfig;
 
 namespace KCal {
 
 
 /**
   This is the main "calendar" object class for KOrganizer.  It holds
   information like all appointments/events, user information, etc. etc.
   one calendar is associated with each CalendarView (@see calendarview.h).
   This is an abstract base class defining the interface to a calendar. It is
   implemented by subclasses like @see CalendarLocal, which use different
   methods to store and access the data.
 
   Ownership of events etc. is handled by the following policy: As soon as an
   event (or any other subclass of IncidenceBase) object is added to the
   Calendar by addEvent() it is owned by the Calendar object. The Calendar takes
   care of deleting it. All Events returned by the query functions are returned
   as pointers, that means all changes to the returned events are immediately
   visible in the Calendar. You shouldn't delete any Event object you get from
   Calendar.
 */
 class Calendar : public QObject, public CustomProperties,
                  public IncidenceBase::Observer
 {
     Q_OBJECT
 public:
     Calendar();
     Calendar(const QString &timeZoneId);
     virtual ~Calendar();
     Incidence * undoIncidence() { return mUndoIncidence; };
     bool undoDeleteIncidence();
     void deleteIncidence(Incidence *in);
     void resetTempSyncStat();
     void resetPilotStat(int id);
     /**
       Clears out the current calendar, freeing all used memory etc.
     */
     virtual void close() = 0;
     virtual void addCalendar( Calendar*  ) = 0;
     virtual bool addCalendarFile( QString name, int id ) = 0;
     virtual bool mergeCalendarFile( QString name ) = 0;
     virtual Incidence* incidenceForUid( const QString& uid, bool doNotCheckDuplicates  ) = 0;
     virtual void setSyncEventsReadOnly() = 0;
     virtual void stopAllTodos() = 0;
+    virtual void clearUndo( Incidence * newUndo );
   
     /**
       Sync changes in memory to persistant storage.
     */
     virtual void save() = 0;
     virtual QPtrList<Event> getExternLastSyncEvents() = 0;
     virtual void removeSyncInfo( QString syncProfile) = 0; 
     virtual bool isSaving() { return false; }
 
     /**
       Return the owner of the calendar's full name.
     */
     const QString &getOwner() const;
     /**
       Set the owner of the calendar. Should be owner's full name.
     */
     void setOwner( const QString &os );
     /**
       Return the email address of the calendar owner.
     */
     const QString &getEmail();
     /**
       Set the email address of the calendar owner.
     */
     void setEmail( const QString & );
   
     /**
       Set time zone from a timezone string (e.g. -2:00)
     */
     void setTimeZone( const QString &tz );
     /**
       Set time zone from a minutes value (e.g. -60)
     */
     void setTimeZone( int tz );
     /**
       Return time zone as offest in minutes.
     */
     int getTimeZone() const;
     /**
       Compute an ISO 8601 format string from the time zone.
     */
     QString getTimeZoneStr() const;
     /**
       Set time zone id (see /usr/share/zoneinfo/zone.tab for list of legal
       values).
     */
     void setTimeZoneId( const QString & );
     /**
       Return time zone id.
     */
     QString timeZoneId() const;
     /**
       Use local time, not UTC or a time zone.
     */
     void setLocalTime();
     /**
       Return whether local time is being used.
     */
     bool isLocalTime() const;
   
     /**
       Add an incidence to calendar.
       
       @return true on success, false on error.
     */
     virtual bool addIncidence( Incidence * ); 
 
     // Adds an incidence and all relatedto incidences to the cal 
     void addIncidenceBranch( Incidence * );  
     /**
       Return filtered list of all incidences of this calendar.
     */
     virtual QPtrList<Incidence> incidences();
 
     /**
       Return unfiltered list of all incidences of this calendar.
     */
     virtual QPtrList<Incidence> rawIncidences();
 
     /**
       Adds a Event to this calendar object.
       @param anEvent a pointer to the event to add
       
       @return true on success, false on error.
     */
     virtual bool addEventNoDup( Event *event ) = 0;
     virtual bool addAnniversaryNoDup( Event *event ) = 0;
     virtual bool addEvent( Event *anEvent ) = 0;
     /**
       Delete event from calendar.
     */
     virtual void deleteEvent( Event * ) = 0;
     /**
       Retrieves an event on the basis of the unique string ID.
     */
     virtual Event *event( const QString &UniqueStr ) = 0;
     virtual Event *event( QString, QString ) = 0;
     /**
       Builds and then returns a list of all events that match for the
       date specified. useful for dayView, etc. etc.
       The calendar filter is applied.
     */
     QPtrList<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 );
     /**
       Get events in a range of dates. If inclusive is set to true, only events
       are returned, which are completely included in the range.
       The calendar filter is applied.
     */
     QPtrList<Event> events( const QDate &start, const QDate &end,
                             bool inclusive = false);
     /**
       Return filtered list of all events in calendar.
     */
     virtual QPtrList<Event> events();
     /**
       Return unfiltered list of all events in calendar.
     */
     virtual QPtrList<Event> rawEvents() = 0;
 
     /**
       Add a todo to the todolist.
       
       @return true on success, false on error.
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index e8c969f..1a1c6be 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -143,386 +143,371 @@ bool CalendarLocal::mergeCalendar( Calendar* remote  )
     QPtrList<Incidence> er = remote->rawIncidences(); 
     Incidence* inR = er.first();
     while ( inR ) {
         inL = incidenceForUid( inR->uid(),false );
         if ( inL ) {
             if ( ! inL->isReadOnly () || inL->uid().left(15) == QString("last-syncEvent-") ) {
                 int calID = inL->calID();
                 deleteIncidence( inL );
                 inL = inR->clone();
                 inL->setCalID( calID );
                 addIncidence( inL );
             }
         } else {
             inL = inR->clone();
             inL->setCalID( 0 );// add to default cal
             addIncidence( inL );
         }
         inR = er.next();
     }
     return true;
 }
 
 
 bool CalendarLocal::addCalendarFile( QString name, int id )
 {
     CalendarLocal calendar( timeZoneId() );
     calendar.setDefaultCalendar( id );
     if ( calendar.load( name ) ) {
         addCalendar( &calendar  );
         return true;
     }
     return false;
 }
 void CalendarLocal::setSyncEventsReadOnly()
 {
     Event * ev;
     ev = mEventList.first();
     while ( ev ) {
         if ( ev->uid().left(15) == QString("last-syncEvent-") )
             ev->setReadOnly( true );
         ev =  mEventList.next();
     } 
 }
 void CalendarLocal::addCalendar( Calendar* cal )
 {
     cal->setDontDeleteIncidencesOnClose();
     {
         QPtrList<Event> EventList = cal->rawEvents();
         Event * ev = EventList.first();
         while ( ev ) {
             ev->unRegisterObserver( cal );
             ev->registerObserver( this );
             mEventList.append( ev );
             ev = EventList.next();
         }
     }
     {
 
         QPtrList<Todo> TodoList = cal->rawTodos();
         Todo * ev = TodoList.first();
         while ( ev ) {
             QString rel = ev->relatedToUid();
             if ( !rel.isEmpty() ){
                 ev->setRelatedTo ( 0 );
                 ev->setRelatedToUid( rel );
             }
             ev = TodoList.next();
         }
         //TodoList = cal->rawTodos();
         ev = TodoList.first();
         while ( ev ) {
             ev->unRegisterObserver( cal );
             ev->registerObserver( this );
             mTodoList.append( ev );
             setupRelations( ev );
             ev = TodoList.next();
         }
     }
     {
         QPtrList<Journal> JournalList = cal->journals();
         Journal * ev = JournalList.first();
         while ( ev ) {
             ev->unRegisterObserver( cal );
             ev->registerObserver( this );
             mJournalList.append( ev );
             ev = JournalList.next();
         }
     }
     setModified( true );
 }
 bool CalendarLocal::load( const QString &fileName )
 {
   FileStorage storage( this, fileName );
   return storage.load();
 }
 
 bool CalendarLocal::save( const QString &fileName, CalFormat *format )
 {
   FileStorage storage( this, fileName, format );
   return storage.save();
 }
 
 void CalendarLocal::stopAllTodos()
 {
     for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
         it->setRunning( false );
 
 }
 void CalendarLocal::close()
 {
 
   Todo * i;
   for( i = mTodoList.first(); i; i = mTodoList.next() ) i->setRunning(false);
 
   mEventList.setAutoDelete( true );
   mTodoList.setAutoDelete( true );
   mJournalList.setAutoDelete( true );
 
   mEventList.clear();
   mTodoList.clear();
   mJournalList.clear();
 
   mEventList.setAutoDelete( false );
   mTodoList.setAutoDelete( false );
   mJournalList.setAutoDelete( false );
 
   setModified( false );
 }
- void CalendarLocal::clearUndo()
-{
-    if ( mUndoIncidence ) {
-        if ( mUndoIncidence->typeID() == eventID )
-            delete  ((Event*) mUndoIncidence) ;
-        else if ( mUndoIncidence->typeID() == todoID )
-            delete ( (Todo*) mUndoIncidence );
-        else if ( mUndoIncidence->typeID() == journalID )
-            delete ( (Journal*) mUndoIncidence );
-        else 
-            delete mUndoIncidence;
-    }
-    mUndoIncidence = 0;
-}   
+
 bool CalendarLocal::addAnniversaryNoDup( Event *event )
 {
     QString cat;
     bool isBirthday = true;
     if(  event->categoriesStr() == i18n( "Anniversary" ) ) {
         isBirthday = false;
         cat = i18n( "Anniversary" );
     } else if(  event->categoriesStr() == i18n( "Birthday" ) ) {
         isBirthday = true;
         cat = i18n( "Birthday" );
     } else {
         qDebug("addAnniversaryNoDup called without fitting category! ");
         return false;
     }
     Event * eve;
     for ( eve = mEventList.first(); eve ; eve = mEventList.next() ) {
         if ( !(eve->categories().contains( cat ) ))
             continue;
         // now we have an event with fitting category
         if ( eve->dtStart().date() != event->dtStart().date() )
             continue;
         // now we have an event with fitting category+date
         if ( eve->summary() != event->summary() )
             continue;
         // now we have an event with fitting category+date+summary
         return false;
     }
     return addEvent( event );
 
 }
 bool CalendarLocal::addEventNoDup( Event *event )
 {
     Event * eve;
     for ( eve = mEventList.first(); eve ; eve = mEventList.next() ) {
         if ( *eve == *event ) {
             //qDebug("CalendarLocal::Duplicate event found! Not inserted! ");
             return false;
         }
     }
     return addEvent( event );
 }
 
 bool CalendarLocal::addEvent( Event *event )
 {
   insertEvent( event );
 
   event->registerObserver( this );
 
   setModified( true );
   if ( event->calID() == 0 )
       event->setCalID( mDefaultCalendar );
   event->setCalEnabled( true );
 
   return true;
 }
 
 void CalendarLocal::deleteEvent( Event *event )
 {
-    clearUndo();
-    mUndoIncidence = event;
+    clearUndo(event);
     if ( mEventList.removeRef( event ) ) {
         setModified( true );
     }
 }
 
 
 Event *CalendarLocal::event( const QString &uid )
 {
     Event *event;
     Event *retVal = 0;
     for ( event = mEventList.first(); event; event = mEventList.next() ) {
         if ( event->calEnabled() && event->uid() == uid ) {
             if ( retVal ) {
                 if ( retVal->calID() > event->calID() ) {
                     retVal = event;
                 }
             } else {
                 retVal = event;
             }
         }
     }
   return retVal;
 }
 bool CalendarLocal::addTodoNoDup( Todo *todo )
 {
   Todo * eve;
     for ( eve = mTodoList.first(); eve ; eve = mTodoList.next() ) {
         if ( *eve == *todo ) {
             //qDebug("duplicate todo found! not inserted! ");
             return false;
         }
     }
     return addTodo( todo );
 }
 bool CalendarLocal::addTodo( Todo *todo )
 {
   mTodoList.append( todo );
 
   todo->registerObserver( this );
 
   // Set up subtask relations
   setupRelations( todo );
 
   setModified( true );
   if ( todo->calID() == 0 )
   todo->setCalID( mDefaultCalendar );
   todo->setCalEnabled( true );
   return true;
 }
 
 void CalendarLocal::deleteTodo( Todo *todo )
 {
   // Handle orphaned children
-    clearUndo();
     removeRelations( todo );
-    mUndoIncidence = todo;
+    clearUndo(todo);
 
   if ( mTodoList.removeRef( todo ) ) {
     setModified( true );
   }
 }
 
 QPtrList<Todo> CalendarLocal::rawTodos()
 {
     QPtrList<Todo> el;
     for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
         if ( it->calEnabled() ) el.append( it );
     return el;
 }
 Todo *CalendarLocal::todo( QString syncProf, QString id )
 {
   Todo *todo;
   for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
       if ( todo->calEnabled() && todo->getID( syncProf ) == id ) return todo;
   }
 
   return 0;
 }
 void CalendarLocal::removeSyncInfo( QString syncProfile)
 {
     QPtrList<Incidence> all = rawIncidences() ;
     Incidence *inc;
     for ( inc = all.first(); inc; inc = all.next() ) {
         inc->removeID( syncProfile );
     }
     if ( syncProfile.isEmpty() ) {
         QPtrList<Event> el;
         Event *todo;
         for ( todo = mEventList.first(); todo; todo = mEventList.next() ) {
             if ( todo->uid().left( 15 ) == QString("last-syncEvent-") )
                     el.append( todo );
         }
         for ( todo = el.first(); todo; todo = el.next() ) {
            deleteIncidence ( todo );
         }
     } else {
         Event *lse = event( "last-syncEvent-"+ syncProfile);
         if ( lse )
             deleteIncidence ( lse );
     }
 }
 QPtrList<Event> CalendarLocal::getExternLastSyncEvents()
 {
     QPtrList<Event> el;
     Event *todo;
     for ( todo = mEventList.first(); todo; todo = mEventList.next() ) {
         if ( todo->uid().left( 15 ) == QString("last-syncEvent-") )
             if ( todo->summary().left(3) == "E: " )
                 el.append( todo );
     }
 
     return el;
 
 }
 Event *CalendarLocal::event( QString syncProf,  QString id )
 {
   Event *todo;
   for ( todo = mEventList.first(); todo; todo = mEventList.next() ) {
       if ( todo->calEnabled() && todo->getID( syncProf ) == id ) return todo;
   }
 
   return 0;
 }
 Todo *CalendarLocal::todo( const QString &uid )
 {
   Todo *todo;;
   Todo *retVal = 0;
   for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
       if ( todo->calEnabled() && todo->uid() == uid ) {
           if ( retVal ) {
                 if ( retVal->calID() > todo->calID() ) {
                     retVal = todo;
                 }
             } else {
                 retVal = todo;
             }
       } 
   }
   return retVal;
 }
 QString CalendarLocal::nextSummary() const
 {
     return mNextSummary;
 }
 QDateTime CalendarLocal::nextAlarmEventDateTime()  const
 {
     return mNextAlarmEventDateTime;
 }
 void  CalendarLocal::checkAlarmForIncidence( Incidence * incidence, bool deleted)
 {
     //mNextAlarmIncidence
     //mNextAlarmDateTime
     //return mNextSummary;
     //return mNextAlarmEventDateTime;
     bool newNextAlarm = false; 
     bool computeNextAlarm = false;
     bool ok;
     int offset;
     QDateTime nextA;
     // QString nextSum;
     //QDateTime nextEvent;
     if ( mNextAlarmIncidence == 0 || incidence == 0 ) {
         computeNextAlarm = true;
     } else {
         if ( ! deleted ) {
             nextA = incidence->getNextAlarmDateTime(& ok, &offset, QDateTime::currentDateTime() ) ;
             if ( ok ) {
                 if ( nextA < mNextAlarmDateTime  ) {
                     deRegisterAlarm();
                     mNextAlarmDateTime = nextA;
                     mNextSummary  = incidence->summary();
                     mNextAlarmEventDateTime = nextA.addSecs(offset ) ; 
                     mNextAlarmEventDateTimeString = KGlobal::locale()->formatDateTime(mNextAlarmEventDateTime);
                     newNextAlarm = true;
                     mNextAlarmIncidence = incidence;
                 } else {
                     if ( incidence == mNextAlarmIncidence ) {
                         computeNextAlarm = true;
                     }
                 }
             } else {
                 if ( mNextAlarmIncidence == incidence ) {
                     computeNextAlarm = true;
                 }
@@ -774,263 +759,262 @@ QPtrList<Event> CalendarLocal::rawEventsForDate( const QDate &qd, bool sorted )
   if ( !sorted ) {
     return eventList;
   }
 
   //  kdDebug(5800) << "Sorting events for date\n" << endl;
   // now, we have to sort it based on dtStart.time()
   QPtrList<Event> eventListSorted;
   Event *sortEvent;
   for ( event = eventList.first(); event; event = eventList.next() ) {
     sortEvent = eventListSorted.first();
     int i = 0;
     while ( sortEvent && event->dtStart().time()>=sortEvent->dtStart().time() )
     {
       i++;
       sortEvent = eventListSorted.next();
     }
     eventListSorted.insert( i, event );
   }
   return eventListSorted;
 }
 
 
 QPtrList<Event> CalendarLocal::rawEvents( const QDate &start, const QDate &end,
                                           bool inclusive )
 {
   Event *event = 0;
 
   QPtrList<Event> eventList;
 
   // Get non-recurring events
   for( event = mEventList.first(); event; event = mEventList.next() ) {
       if ( !event->calEnabled() ) continue;
     if ( event->doesRecur() ) {
       QDate rStart = event->dtStart().date();
       bool found = false;
       if ( inclusive ) {
         if ( rStart >= start && rStart <= end ) {
           // Start date of event is in range. Now check for end date.
           // if duration is negative, event recurs forever, so do not include it.
           if ( event->recurrence()->duration() == 0 ) {  // End date set
             QDate rEnd = event->recurrence()->endDate();
             if ( rEnd >= start && rEnd <= end ) {  // End date within range
               found = true;
             }
           } else if ( event->recurrence()->duration() > 0 ) {  // Duration set
             // TODO: Calculate end date from duration. Should be done in Event
             // For now exclude all events with a duration.
           }
         }
       } else {
           bool founOne;
           QDate next = event->getNextOccurence( start, &founOne ).date();
           if ( founOne ) {
               if ( next <= end ) {
                   found = true;
               }
           }
           
           /*
           // crap !!!
         if ( rStart <= end ) {  // Start date not after range
           if ( rStart >= start ) {  // Start date within range
             found = true;
           } else if ( event->recurrence()->duration() == -1 ) {  // Recurs forever
             found = true;
           } else if ( event->recurrence()->duration() == 0 ) {  // End date set
             QDate rEnd = event->recurrence()->endDate();
             if ( rEnd >= start && rEnd <= end ) {  // End date within range
               found = true;
             }
           } else {  // Duration set
             // TODO: Calculate end date from duration. Should be done in Event
             // For now include all events with a duration.
             found = true;
           }
         }
           */
 
       }
 
       if ( found ) eventList.append( event );
     } else {
       QDate s = event->dtStart().date();
       QDate e = event->dtEnd().date();
 
       if ( inclusive ) {
         if ( s >= start && e <= end ) {
           eventList.append( event );
         }
       } else {
         if ( ( e >= start && s <= end ) ) {
           eventList.append( event );
         }
       }
     }
   }
 
   return eventList;
 }
 
 QPtrList<Event> CalendarLocal::rawEventsForDate( const QDateTime &qdt )
 {
   return rawEventsForDate( qdt.date() );
 }
 
 QPtrList<Event> CalendarLocal::rawEvents()
 {
     QPtrList<Event> el;
     for ( Event *it = mEventList.first(); it; it = mEventList.next() )
         if ( it->calEnabled() ) el.append( it );
     return el;
 }
 
 bool CalendarLocal::addJournal(Journal *journal)
 {
     mJournalList.append(journal);
 
   journal->registerObserver( this );
 
   setModified( true );
   if ( journal->calID() == 0 )
       journal->setCalID( mDefaultCalendar );
   journal->setCalEnabled( true );
   return true;
 }
 
 void CalendarLocal::deleteJournal( Journal *journal )
 {
-    clearUndo();
-    mUndoIncidence = journal;
+    clearUndo(journal);
   if ( mJournalList.removeRef(journal) ) {
     setModified( true );
   }
 }
 
 QPtrList<Journal> CalendarLocal::journals4Date( const QDate & date )
 {
     QPtrList<Journal> el;
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         if ( it->calEnabled() && it->dtStart().date() == date) el.append( it );
     return el;
 }
 Journal *CalendarLocal::journal( const QDate &date )
 {
 //  kdDebug(5800) << "CalendarLocal::journal() " << date.toString() << endl;
 
   for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
       if ( it->calEnabled() && it->dtStart().date() == date )
       return it;
 
   return 0;
 }
 
 Journal *CalendarLocal::journal( const QString &uid )
 {
     Journal * retVal = 0;
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         if ( it->calEnabled() && it->uid() == uid ) {
             if ( retVal ) {
                 if ( retVal->calID() > it->calID() ) {
                     retVal = it;
                 }
             } else {
                 retVal = it;
             }
         }
     return retVal;
 }
 
 QPtrList<Journal> CalendarLocal::journals()
 {
     QPtrList<Journal> el;
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         if ( it->calEnabled() ) el.append( it );
     return el;
 }
 void CalendarLocal::setCalendarRemove( int id )
 {
    
     {
         QPtrList<Event> EventList = mEventList;
         Event * ev = EventList.first();
         while ( ev ) {
             if ( ev->calID() == id )
                 deleteEvent( ev );
             ev = EventList.next();
         }
     }
     {
 
         QPtrList<Todo> TodoList = mTodoList;
         Todo * ev = TodoList.first();
         while ( ev ) {
             if ( ev->calID() == id )
                 deleteTodo( ev );
             ev = TodoList.next();
         }
     }
     {
         QPtrList<Journal> JournalList = mJournalList;
         Journal * ev = JournalList.first();
         while ( ev ) {
             if ( ev->calID() == id )
                 deleteJournal( ev );
             ev = JournalList.next();
         }
     }
 
-    clearUndo();
+    clearUndo(0);
 
 }
 
 void CalendarLocal::setCalendarEnabled( int id, bool enable )
 {
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         if ( it->calID() == id ) it->setCalEnabled( enable );
 
     for ( Event *it = mEventList.first(); it; it = mEventList.next() )
         if ( it->calID() == id ) it->setCalEnabled( enable );
 
     for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
         if ( it->calID() == id ) it->setCalEnabled( enable );
 
 }
 
 void CalendarLocal::setReadOnly( int id, bool enable )
 {
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         if ( it->calID() == id ) it->setReadOnly( enable );
 
     for ( Event *it = mEventList.first(); it; it = mEventList.next() )
         if ( it->calID() == id ) it->setReadOnly( enable );
 
     for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
         if ( it->calID() == id ) it->setReadOnly( enable );
 
 }
 
 void CalendarLocal::setAlarmEnabled( int id, bool enable )
 {
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         if ( it->calID() == id ) it->setAlarmEnabled( enable );
 
     for ( Event *it = mEventList.first(); it; it = mEventList.next() )
         if ( it->calID() == id ) it->setAlarmEnabled( enable );
 
     for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
         if ( it->calID() == id ) it->setAlarmEnabled( enable );
     reInitAlarmSettings();
 
 }
 void CalendarLocal::setDefaultCalendarEnabledOnly()
 {
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         it->setCalEnabled( it->calID() == mDefaultCalendar );
 
     for ( Event *it = mEventList.first(); it; it = mEventList.next() )
         it->setCalEnabled( it->calID() == mDefaultCalendar);
 
     for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
         it->setCalEnabled( it->calID() == mDefaultCalendar);
 
 }
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h
index ae7e30c..a7a85c8 100644
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@@ -1,200 +1,199 @@
 /*
     This file is part of libkcal.
 
     Copyright (c) 1998 Preston Brown
     Copyright (c) 2001,2003 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 #ifndef KCAL_CALENDARLOCAL_H
 #define KCAL_CALENDARLOCAL_H
 
 #include "calendar.h"
 
 namespace KCal {
 
 class CalFormat;
 
 /**
   This class provides a calendar stored as a local file.
 */
 class CalendarLocal : public Calendar
 {
   public:
     /**
       Constructs a new calendar, with variables initialized to sane values.
     */
     CalendarLocal();
     /**
       Constructs a new calendar, with variables initialized to sane values.
     */
     CalendarLocal( const QString &timeZoneId );
     ~CalendarLocal();
     void addCalendar( Calendar*  );
     bool addCalendarFile( QString name, int id );
     bool mergeCalendarFile( QString name );
     bool mergeCalendar( Calendar* cal );
     Incidence* incidenceForUid( const QString& uid, bool doNotCheckDuplicates  );
     void setSyncEventsReadOnly();
     void stopAllTodos();
     /**
       Loads a calendar on disk in vCalendar or iCalendar format into the current
       calendar. Any information already present is lost.
       @return true, if successfull, false on error.
       @param fileName the name of the calendar on disk.
     */
     bool load( const QString &fileName );
     /**
       Writes out the calendar to disk in the specified \a format.
       CalendarLocal takes ownership of the CalFormat object.
       @return true, if successfull, false on error.
       @param fileName the name of the file
     */
     bool save( const QString &fileName, CalFormat *format = 0 );
 
     /**
       Clears out the current calendar, freeing all used memory etc. etc.
     */
     void close();
-    void clearUndo();
 
     void save() {}
   
     /**
       Add Event to calendar.
     */
     void removeSyncInfo( QString syncProfile); 
     bool addAnniversaryNoDup( Event *event );
     bool addEventNoDup( Event *event );
     bool addEvent( Event *event );
     /** 
       Deletes an event from this calendar.
     */
     void deleteEvent( Event *event );
 
     /**
       Retrieves an event on the basis of the unique string ID.
     */
     Event *event( const QString &uid );
     /**
       Return unfiltered list of all events in calendar.
     */
     QPtrList<Event> rawEvents();
     QPtrList<Event> getExternLastSyncEvents();
     /**
       Add a todo to the todolist.
     */
     bool addTodo( Todo *todo );
     bool addTodoNoDup( Todo *todo );
     /**
       Remove a todo from the todolist.
     */
     void deleteTodo( Todo * );
     /**
       Searches todolist for an event with this unique string identifier,
       returns a pointer or null.
     */
     Todo *todo( const QString &uid );
     /**
       Return list of all todos.
     */
     QPtrList<Todo> rawTodos();
     /**
       Returns list of todos due on the specified date.
     */
     QPtrList<Todo> todos( const QDate &date );
     /**
       Return list of all todos.
       
       Workaround because compiler does not recognize function of base class.
     */
     QPtrList<Todo> todos() { return Calendar::todos(); }
 
     /**
       Add a Journal entry to calendar.
     */
     bool addJournal( Journal * );
     /**
       Remove a Journal from the calendar.
     */
     void deleteJournal( Journal * );
     /**
       Return Journal for given date.
     */
     Journal *journal( const QDate & );
     QPtrList<Journal> journals4Date( const QDate & );
     /**
       Return Journal with given UID.
     */
     Journal *journal( const QString &uid );
     /**
       Return list of all Journals stored in calendar.
     */
     QPtrList<Journal> journals();
 
     /**
       Return all alarms, which ocur in the given time interval.
     */
     Alarm::List alarms( const QDateTime &from, const QDateTime &to );
 
     /**
       Return all alarms, which ocur before given date.
     */
     Alarm::List alarmsTo( const QDateTime &to );
  
     QDateTime nextAlarm( int daysTo ) ;
     QDateTime nextAlarmEventDateTime()  const;
     void  checkAlarmForIncidence( Incidence *, bool deleted )  ;
     void registerAlarm();
     void deRegisterAlarm();
     QString getAlarmNotification();
     QString nextSummary() const ;
     /**
       This method should be called whenever a Event is modified directly
       via it's pointer. It makes sure that the calendar is internally
       consistent.
     */
     void update( IncidenceBase *incidence );
  
     /**
       Builds and then returns a list of all events that match for the
       date specified. useful for dayView, etc. etc.
     */
     QPtrList<Event> rawEventsForDate( const QDate &date, bool sorted = false );
     /**
       Get unfiltered events for date \a qdt.
     */
     QPtrList<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,
                                bool inclusive = false );
     Todo *todo( QString, QString );
     Event *event( QString, QString );
  
 public slots:
     void setCalendarEnabled( int id, bool enable );
     void setAlarmEnabled( int id, bool enable );
     void setReadOnly( int id, bool enable );
     void setDefaultCalendarEnabledOnly();
     void setCalendarRemove( int id );
 
   protected:
 
     // Event* mNextAlarmEvent;
     QString mNextSummary;
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 52d94fb..549014e 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -366,257 +366,261 @@ void Incidence::setRevision(int rev)
   if (mReadOnly) return;
   mRevision = rev;
 
   updated();
 }
 
 int Incidence::revision() const
 {
   return mRevision;
 }
 
 void Incidence::setDtStart(const QDateTime &dtStart)
 {
 
   QDateTime  dt = getEvenTime(dtStart);
 
   if ( mRecurrence )
       mRecurrence->setRecurStart( dt);
   IncidenceBase::setDtStart( dt );
 }
 
 void Incidence::setDescription(const QString &description)
 {
   if (mReadOnly) return;
   mDescription = description;
   updated();
 }
 
 QString Incidence::description() const
 {
   return mDescription;
 }
 
 
 void Incidence::setSummary(const QString &summary)
 {
   if (mReadOnly) return;
   mSummary = summary;
   updated();
 }
 
 QString Incidence::summary() const
 {
   return mSummary;
 }
 void Incidence::checkCategories()
 {
     mHoliday =  mCategories.contains("Holiday") || mCategories.contains(i18n("Holiday"));
     mBirthday =  mCategories.contains("Birthday") || mCategories.contains(i18n("Birthday"));
     mAnniversary =  mCategories.contains("Anniversary") || mCategories.contains(i18n("Anniversary"));
 }
 
 void Incidence::addCategories(const QStringList &categories, bool addToRelations ) //addToRelations = false
 {
     if (mReadOnly) return;
     int i;
     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();
         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();
       for (inc=Relations.first();inc;inc=Relations.next()) {
           inc->setCategories( categories, true );
       } 
   }
 }
 
 // TODO: remove setCategories(QString) function
 void Incidence::setCategories(const QString &catStr)
 {
   if (mReadOnly) return;
   mCategories.clear();
 
   if (catStr.isEmpty()) return;
 
   mCategories = QStringList::split(",",catStr);
 
   QStringList::Iterator it;
   for(it = mCategories.begin();it != mCategories.end(); ++it) {
     *it = (*it).stripWhiteSpace();
   }
   checkCategories();
   updated();
 }
 // using this makes filtering 3 times faster
 QStringList* Incidence::categoriesP()
 {
   return &mCategories;
 }
 
 QStringList Incidence::categories() const
 {
   return mCategories;
 }
 
 QString Incidence::categoriesStr()
 {
   return mCategories.join(",");
 }
 QString Incidence::categoriesStrWithSpace()
 {
   return mCategories.join(", ");
 }
 
 void Incidence::setRelatedToUid(const QString &relatedToUid)
 {
   if (mReadOnly) return;
   mRelatedToUid = relatedToUid;
 }
-
+void Incidence::clearRelations()
+{
+    mRelatedTo = 0;
+    mRelations.clear();
+}
 QString Incidence::relatedToUid() const
 {
   return mRelatedToUid;
 }
 
 void Incidence::setRelatedTo(Incidence *relatedTo)
 {
     //qDebug("Incidence::setRelatedTo %d ", relatedTo);
     //qDebug("setRelatedTo(Incidence *relatedTo) %s %s", summary().latin1(), relatedTo->summary().latin1() );
   if (mReadOnly || mRelatedTo == relatedTo) return;
   if(mRelatedTo) {
       // updated();
     mRelatedTo->removeRelation(this);
   }
   mRelatedTo = relatedTo;
   if (mRelatedTo)  {
       mRelatedTo->addRelation(this);
       mRelatedToUid = mRelatedTo->uid();
   } else {
       mRelatedToUid = "";
   }
 }
 
 Incidence *Incidence::relatedTo() const
 {
   return mRelatedTo;
 }
 
 QPtrList<Incidence> Incidence::relations() const
 {
   return mRelations;
 }
 
 void Incidence::addRelationsToList(QPtrList<Incidence> *rel)
 {
     Incidence* inc;
     QPtrList<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)
 {
     setLastModifiedSubInvalid();
   if( mRelations.findRef( event ) == -1 ) {
     mRelations.append(event);
     //updated();
   }
 }
 
 void Incidence::removeRelation(Incidence *event)
 {
     setLastModifiedSubInvalid();
   mRelations.removeRef(event);
 //  if (event->getRelatedTo() == this) event->setRelatedTo(0);
 }
 
 bool Incidence::recursOn(const QDate &qd) const
 {
   if (mRecurrence && mRecurrence->recursOnPure(qd) && !isException(qd)) return true;
   else return false;
 }
 
 void Incidence::setExDates(const DateList &exDates)
 {
   if (mReadOnly) return;
   mExDates = exDates;
   recurrence()->setRecurExDatesCount(mExDates.count());
 
   updated();
 }
 
 void Incidence::addExDate(const QDate &date)
 {
   if (mReadOnly) return;
   mExDates.append(date);
 
   recurrence()->setRecurExDatesCount(mExDates.count());
 
   updated();
 }
 
 DateList Incidence::exDates() const
 {
   return mExDates;
 }
 
 bool Incidence::isException(const QDate &date) const
 {
   DateList::ConstIterator it;
   for( it = mExDates.begin(); it != mExDates.end(); ++it ) {
     if ( (*it) == date ) {
       return true;
     }
   }
 
   return false;
 }
 
 void Incidence::addAttachment(Attachment *attachment)
 {
   if (mReadOnly || !attachment) return;
   mAttachments.append(attachment);
   updated();
 }
 
 void Incidence::deleteAttachment(Attachment *attachment)
 {
   mAttachments.removeRef(attachment);
 }
 
 void Incidence::deleteAttachments(const QString& mime)
 {
   Attachment *at = mAttachments.first();
   while (at) {
     if (at->mimeType() == mime)
       mAttachments.remove();
     else
       at = mAttachments.next();
   }
 }
 
 QPtrList<Attachment> Incidence::attachments() const
 {
   return mAttachments;
diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index 88df217..eef9e64 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -1,244 +1,245 @@
 /*
     This file is part of libkcal.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 #ifndef INCIDENCE_H
 #define INCIDENCE_H
 //
 // Incidence - base class of calendaring components
 //
 
 #include <qdatetime.h>
 #include <qstringlist.h>
 #include <qvaluelist.h>
 
 #include "recurrence.h"
 #include "alarm.h"
 #include "attachment.h"
 #include "listbase.h"
 #include "incidencebase.h"
 
 namespace KCal {
 
 class Event;
 class Todo;
 class Journal;
 
 /**
   This class provides the base class common to all calendar components.
 */
 class Incidence : public IncidenceBase
 {
   public:
     /**
       This class provides the interface for a visitor of calendar components. It
       serves as base class for concrete visitors, which implement certain actions on
       calendar components. It allows to add functions, which operate on the concrete
       types of calendar components, without changing the calendar component classes.
     */
     class Visitor
     {
       public:
         /** Destruct Incidence::Visitor */
         virtual ~Visitor() {}
 
         /**
           Reimplement this function in your concrete subclass of IncidenceVisitor to perform actions
           on an Event object.
         */
         virtual bool visit(Event *) { return false; }
         /**
           Reimplement this function in your concrete subclass of IncidenceVisitor to perform actions
           on an Todo object.
         */
         virtual bool visit(Todo *) { return false; }
         /**
           Reimplement this function in your concrete subclass of IncidenceVisitor to perform actions
           on an Journal object.
         */
         virtual bool visit(Journal *) { return false; }
 
       protected:
         /** Constructor is protected to prevent direct creation of visitor base class. */
         Visitor() {}
     };
 
     /**
       This class implements a visitor for adding an Incidence to a resource
       supporting addEvent(), addTodo() and addJournal() calls.
     */
     template<class T>
     class AddVisitor : public Visitor
     {
       public:
         AddVisitor( T *r ) : mResource( r ) {}
         bool visit( Event *e ) { return mResource->addEvent( e ); }
         bool visit( Todo *t ) { return mResource->addTodo( t ); }
         bool visit( Journal *j ) { return mResource->addJournal( j ); }
 
       private:
         T *mResource;
     };
 
     /** enumeration for describing an event's secrecy. */
     enum { SecrecyPublic = 0, SecrecyPrivate = 1, SecrecyConfidential = 2 };
     typedef ListBase<Incidence> List;
     Incidence();
     Incidence(const Incidence &);
     ~Incidence();
 
     /**
       Accept IncidenceVisitor. A class taking part in the visitor mechanism has to
       provide this implementation:
       <pre>
         bool accept(Visitor &v) { return v.visit(this); }
       </pre>
     */
     virtual bool accept(Visitor &) { return false; }
 
     virtual Incidence *clone() = 0;
     virtual void cloneRelations( Incidence * );
     void addRelationsToList(QPtrList<Incidence> *rel);
+    void clearRelations();
     virtual QDateTime getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const = 0;
     void setReadOnly( bool );
 
     /**
       Recreate event. The event is made a new unique event, but already stored
       event information is preserved. Sets uniquie id, creation date, last
       modification date and revision number.
     */
     void recreate();
     Incidence*  recreateCloneException(QDate);
 
     /** set creation date */
     void setCreated(QDateTime);
     /** return time and date of creation. */
     QDateTime created() const;
 
     /** set the number of revisions this event has seen */
     void setRevision(int rev);
     /** return the number of revisions this event has seen */
     int revision() const;
 
     /** Set starting date/time. */
     virtual void setDtStart(const QDateTime &dtStart);
     /** Return the incidence's ending date/time as a QDateTime. */
     virtual QDateTime dtEnd() const  { return QDateTime(); }
 
     /** sets the event's lengthy description. */
     void setDescription(const QString &description);
     /** returns a reference to the event's description. */
     QString description() const;
 
     /** sets the event's short summary. */
     void setSummary(const QString &summary);
     /** returns a reference to the event's summary. */
     QString summary() const;
 
     /** set event's applicable categories */
     void setCategories(const QStringList &categories, bool setForRelations = false);
     void addCategories(const QStringList &categories, bool addToRelations = false);
     /** set event's categories based on a comma delimited string */
     void setCategories(const QString &catStr);
     /** return categories in a list */
     QStringList categories() const;
     QStringList* categoriesP();
     /** return categories as a comma separated string */
     QString categoriesStr();
     QString categoriesStrWithSpace();
 
     /** point at some other event to which the event relates. This function should
      *  only be used when constructing a calendar before the related Event
      *  exists. */
     void setRelatedToUid(const QString &);
     /** what event does this one relate to? This function should
      *  only be used when constructing a calendar before the related Event
      *  exists. */
     QString relatedToUid() const;
     /** point at some other event to which the event relates */
     void setRelatedTo(Incidence *relatedTo);
     /** what event does this one relate to? */
     Incidence *relatedTo() const;
     /** All events that are related to this event */
     QPtrList<Incidence> relations() const;
     /** Add an event which is related to this event */
     void addRelation(Incidence *);
     /** Remove event that is related to this event */
     void removeRelation(Incidence *);
 
     /** returns the list of dates which are exceptions to the recurrence rule */
     DateList exDates() const;
     /** sets the list of dates which are exceptions to the recurrence rule */
     void setExDates(const DateList &_exDates);
     void setExDates(const char *dates);
     /** Add a date to the list of exceptions of the recurrence rule. */
     void addExDate(const QDate &date);
 
     /** returns true if there is an exception for this date in the recurrence
      rule set, or false otherwise. */
     bool isException(const QDate &qd) const;
 
     /** add attachment to this event */
     void addAttachment(Attachment *attachment);
     /** remove and delete a specific attachment */
     void deleteAttachment(Attachment *attachment);
     /** remove and delete all attachments with this mime type */
     void deleteAttachments(const QString& mime);
     /** return list of all associated attachments */
     QPtrList<Attachment> attachments() const;
     /** find a list of attachments with this mime type */
     QPtrList<Attachment> attachments(const QString& mime) const;
 
     /** sets the event's status the value specified.  See the enumeration
      * above for possible values. */
     void setSecrecy(int);
     /** return the event's secrecy. */
     int secrecy() const;
     /** return the event's secrecy in string format. */
     QString secrecyStr() const;
     /** return list of all availbale secrecy classes */
     static QStringList secrecyList();
     /** return human-readable name of secrecy class */
     static QString secrecyName(int);
 
     /** returns TRUE if the date specified is one on which the event will
      * recur. */
     bool recursOn(const QDate &qd) const;
 
     // VEVENT and VTODO, but not VJOURNAL (move to EventBase class?):
 
     /** set resources used, such as Office, Car, etc. */
     void setResources(const QStringList &resources);
     /** return list of current resources */
     QStringList resources() const;
 
     /** set the event's priority, 0 is undefined, 1 highest (decreasing order) */
     void setPriority(int priority);
     /** get the event's priority */
     int priority() const;
 
     /** All alarms that are associated with this incidence */
     QPtrList<Alarm> alarms() const;
     /** Create a new alarm which is associated with this incidence */
     Alarm* newAlarm();
     /** Add an alarm which is associated with this incidence */
     void addAlarm(Alarm*);
     /** Remove an alarm that is associated with this incidence */
     void removeAlarm(Alarm*);
     /** Remove all alarms that are associated with this incidence */
     void clearAlarms();