summaryrefslogtreecommitdiffabout
path: root/libkcal
Side-by-side diff
Diffstat (limited to 'libkcal') (more/less context) (show whitespace changes)
-rw-r--r--libkcal/calendarlocal.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 8a5a76f..ce3cd09 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -280,20 +280,20 @@ void CalendarLocal::addCalendar( Calendar* cal )
{
QPtrList<Todo> TodoList = cal->rawTodos();
Todo * ev = TodoList.first();
while ( ev ) {
ev->resetRelatedTo();
+ Todo * se = todo( ev->uid() );
+ if ( se )
+ deleteTodo( se );
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();
}
@@ -309,14 +309,14 @@ void CalendarLocal::addCalendar( Calendar* 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 )
{