CVS commit by kainhofe: Correctly remove the related-to setting when making sub-to-dos independent. BUG:98384 M +2 -6 korganizer/calendarview.cpp 1.330 M +2 -0 libkcal/incidence.cpp 1.56 --- kdepim/korganizer/calendarview.cpp #1.329:1.330 @@ -1064,10 +1064,6 @@ bool CalendarView::todo_unsub( Todo *tod if ( mChanger->beginChange( todo ) ) { - Todo *oldTodo = todo->clone(); - // I think that this is called on Incidence::setRelatedTo - todo->relatedTo()->removeRelation(todo); todo->setRelatedTo(0); - todo->setRelatedToUid(""); mChanger->changeIncidence( oldTodo, todo, KOGlobals::RELATION_MODIFIED ); mChanger->endChange( todo ); @@ -1088,5 +1084,4 @@ bool CalendarView::makeSubTodosIndepende bool status = false; Todo *anTodo = selectedTodo(); - startMultiModify ( i18n( "Make sub-to-dos independent" ) ); if( makeSubTodosIndependents( anTodo ) ) { @@ -1094,5 +1089,4 @@ bool CalendarView::makeSubTodosIndepende status = true; } - endMultiModify(); return status; } @@ -1102,4 +1096,5 @@ bool CalendarView::makeSubTodosIndepende if( !todo || todo->relations().isEmpty() ) return false; + startMultiModify ( i18n( "Make sub-to-dos independent" ) ); Incidence::List subTodos( todo->relations() ); Incidence::List::Iterator it; @@ -1114,4 +1109,5 @@ bool CalendarView::makeSubTodosIndepende } } + endMultiModify(); return true; } --- kdepim/libkcal/incidence.cpp #1.55:1.56 @@ -290,4 +290,6 @@ void Incidence::setRelatedTo(Incidence * if ( mRelatedTo->uid() != mRelatedToUid ) setRelatedToUid( mRelatedTo->uid() ); + } else { + setRelatedToUid( QString::null ); } }