1 files changed, 16 insertions, 7 deletions

diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 980663f..8a5a76f 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -70,432 +70,441 @@ CalendarLocal::~CalendarLocal()
         close();
 }
 bool CalendarLocal::mergeCalendarFile( QString name )
 {
     CalendarLocal calendar( timeZoneId() );
     calendar.setDefaultCalendar( 1 );
     if ( calendar.load( name ) ) {
         mergeCalendar( &calendar  );
         return true;
     }
     return false;
 }
 
 Todo* CalendarLocal::todoForUid( const QString& uid, bool doNotCheckDuplicates, bool enabledOnly,int * isDup )
 {
 
     int calID = 0;
     if ( isDup  && *isDup > 0 )
         calID = *isDup;
     Todo *todo;;
     Todo *retVal = 0;
     for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
         if ( todo->uid() == uid ) {
             if( calID ) {
                 if ( todo->calID() != calID )
                     continue;
             }
             else {
                 if ( enabledOnly ) {
                     if ( !todo->calEnabled() ) {
                         if ( isDup )
                             *isDup = todo->calID();
                         continue;
                     }
                 }
             }
             if ( doNotCheckDuplicates ) return todo;
             if ( retVal ) {
                 if ( retVal->calID() > todo->calID() ) {
                     if ( isDup )
                         *isDup = retVal->calID();
                     retVal = todo;
                 }
             } else {
                 retVal = todo;
             }
         } 
     }
     return retVal;
 } 
 //if ( isDup) and * isDup == 0: store duplicate found cal id in  isDup
 //if ( isDup) and * isDup > 0: search only in calendar with ID *isDup, ignore enabledOnly
 
 Incidence* CalendarLocal::incidenceForUid( const QString& uid , bool doNotCheckDuplicates, bool enabledOnly, int * isDup ) 
 {
     int calID = 0;
     if ( isDup  && *isDup > 0 )
         calID = *isDup;
     Incidence *retVal = todoForUid( uid , doNotCheckDuplicates,enabledOnly, isDup );
     if ( retVal ) return retVal;
     Event *event;
     for ( event = mEventList.first(); event; event = mEventList.next() ) {
         if (  event->uid() == uid ) {
             if( calID ) {
                 if ( event->calID() != calID )
                     continue;
             }
             else {
                 if ( enabledOnly ) {
                     if ( !event->calEnabled() )  {
                         if ( isDup )
                             *isDup =event->calID() ;
                         continue;
                     }
                 }
             }
             if ( doNotCheckDuplicates ) return event;
             if ( retVal ) {
                 if ( retVal->calID() > event->calID() ) {
                     if ( isDup )
                         *isDup = retVal->calID();
                     retVal = event;
                 }
             } else {
                 retVal = event;
             }
         }
     }
     if ( retVal ) return retVal;
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         if ( it->uid() == uid ) {
             if( calID ) {
                 if ( event->calID() != calID )
                     continue;
             }
             else {
                 if ( enabledOnly ) {
                     if ( !it->calEnabled() ) {
                         if ( isDup )
                             *isDup = it->calID();
                         continue;
                     }
                 }
             }
             if ( doNotCheckDuplicates ) return it;
             if ( retVal ) {
                 if ( retVal->calID() > it->calID() ) { 
                     if ( isDup )
                         *isDup = retVal->calID();
                     retVal = it;
                 }
             } else {
                 retVal = it;
             }
         }
     return retVal;
 }
 
 bool CalendarLocal::mergeCalendar( Calendar* remote  )
 {
     // 1 look for raw inc in local
     //   if inc not in remote, delete in local
     // 2 look for raw inc in remote
     //   if inc in local, replace it
     //   if not in local, add it to default calendar
     QPtrList<Incidence> localInc = rawIncidences(); 
     Incidence* inL = localInc.first(); 
     while ( inL ) {
         if ( ! inL->isReadOnly () )
             if ( !remote->incidenceForUid( inL->uid(), true ))
                 deleteIncidence( inL );
         inL = localInc.next();
     }
     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_block( calID );
                 addIncidence( inL );
             }
         } else {
             inL = inR->clone();
             inL->setCalID_block( 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::setSyncEventsEnabled()
 {
     Event * ev;
     ev = mEventList.first();
     while ( ev ) {
         if ( ev->uid().left(15) == QString("last-syncEvent-") )
             ev->setCalEnabled( true );
         ev =  mEventList.next();
     } 
 }
 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();
     setSyncEventsEnabled();
+    QPtrList<Incidence> incList;
     {
         QPtrList<Event> EventList = cal->rawEvents();
-        QPtrList<Event> el;
         Event * ev = EventList.first();
         while ( ev ) {
             if ( ev->uid().left( 15 ) == QString("last-syncEvent-") ) {
-                Event * se = event( ev->uid() );
-                if ( se )
-                    el.append( se );    
                 ev->setCalID_block( 1 );
             }
+            Event * se = event( ev->uid() );
+            if ( se )
+                incList.append( se );    
             ev->unRegisterObserver( cal );
             ev->registerObserver( this );
             mEventList.append( ev );
             ev = EventList.next();
         }
-         for ( ev = el.first(); ev; ev = el.next() ) {
-           deleteIncidence ( ev );
-        }
+         
     }
     {
 
         QPtrList<Todo> TodoList = cal->rawTodos();
         Todo * ev = TodoList.first();
         while ( ev ) {
             ev->resetRelatedTo();
             ev = TodoList.next();
         }
         //TodoList = cal->rawTodos();
         ev = TodoList.first();
         while ( ev ) {
+            Todo * se = todo( ev->uid() );
+            if ( se )
+                incList.append( se );    
             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 ) {
+            Journal * se = journal( ev->uid() );
+            if ( se )
+                incList.append( se );    
             ev->unRegisterObserver( cal );
             ev->registerObserver( this );
             mJournalList.append( ev );
             ev = JournalList.next();
         }
     }
+    {
+        for (Incidence * ev = incList.first(); ev; ev = incList.next() ) {
+            deleteIncidence ( ev );
+        }
+    }
     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 );
 }
 
 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_block( mDefaultCalendar );
   event->setCalEnabled( true );
 
   return true;
 }
 
 void CalendarLocal::deleteEvent( Event *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_block( mDefaultCalendar );
   todo->setCalEnabled( true );
   return true;
 }
 
 void CalendarLocal::deleteTodo( Todo *todo )
 {
     QString uid =  todo->uid();
   // Handle orphaned children
     removeRelations( todo );
     clearUndo(todo);
 
   if ( mTodoList.removeRef( todo ) ) {
     setModified( true );
   }
    Todo* dup = todoForUid(  uid );
    if ( dup )
        setupRelations( dup );
 }
 
 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() ) {