fixxx

1 files changed, 5 insertions, 21 deletions

diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index e8c969f..1a1c6be 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -270,16 +270,3 @@ void CalendarLocal::close()
 }
- 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 )
@@ -342,4 +329,3 @@ void CalendarLocal::deleteEvent( Event *event )
 {
-    clearUndo();
-    mUndoIncidence = event;
+    clearUndo(event);
     if ( mEventList.removeRef( event ) ) {
@@ -397,5 +383,4 @@ void CalendarLocal::deleteTodo( Todo *todo )
   // Handle orphaned children
-    clearUndo();
     removeRelations( todo );
-    mUndoIncidence = todo;
+    clearUndo(todo);
 
@@ -901,4 +886,3 @@ void CalendarLocal::deleteJournal( Journal *journal )
 {
-    clearUndo();
-    mUndoIncidence = journal;
+    clearUndo(journal);
   if ( mJournalList.removeRef(journal) ) {
@@ -981,3 +965,3 @@ void CalendarLocal::setCalendarRemove( int id )
 
-    clearUndo();
+    clearUndo(0);