sync

1 files changed, 7 insertions, 7 deletions

diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 8a5a76f..ce3cd09 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -274,55 +274,55 @@ void CalendarLocal::addCalendar( Calendar* cal )
             ev->registerObserver( this );
             mEventList.append( ev );
             ev = EventList.next();
         }
          
     }
     {
 
         QPtrList<Todo> TodoList = cal->rawTodos();
         Todo * ev = TodoList.first();
         while ( ev ) {
             ev->resetRelatedTo();
-            ev = TodoList.next();
+            Todo * se = todo( ev->uid() );
+            if ( se )
+                deleteTodo( se ); 
+            ev = TodoList.next();   
         }
-        //TodoList = cal->rawTodos();
+        //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 );
+        for (Incidence * inc = incList.first(); inc; inc = incList.next() ) {
+            deleteIncidence ( inc );
         }
     }
     setModified( true );
 }
 bool CalendarLocal::load( const QString &fileName )
 {
   FileStorage storage( this, fileName );
   return storage.load();
 }
 
 bool CalendarLocal::save( const QString &fileName, CalFormat *format )
 {