5 files changed, 35 insertions, 3 deletions

diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp
index 52daaaa..88351eb 100644
--- a/libkcal/calendar.cpp
+++ b/libkcal/calendar.cpp
@@ -51,9 +51,9 @@ Calendar::Calendar( const QString &timeZoneId )
 void Calendar::init()
 {
   mObserver = 0;
   mNewObserver = false;
-
+  mUndoIncidence = 0;
   mModified = false;
 
   // Setup default filter, which does nothing
   mDefaultFilter = new CalFilter;
@@ -108,15 +108,24 @@ void Calendar::init()
 
 Calendar::~Calendar()
 {
   delete mDefaultFilter;
+  if ( mUndoIncidence )
+      delete mUndoIncidence;
 }
 
 const QString &Calendar::getOwner() const
 {
   return mOwner;
 }
 
+bool Calendar::undoDeleteIncidence()
+{
+    if (!mUndoIncidence)
+        return false;
+    addIncidence(mUndoIncidence);
+    mUndoIncidence = 0;
+}
 void Calendar::setOwner(const QString &os)
 {
   int i;
   mOwner = os;
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index b7d6a1f..2f2c3aa 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -64,8 +64,10 @@ class Calendar : public QObject, public CustomProperties,
 public:
     Calendar();
     Calendar(const QString &timeZoneId);
     virtual ~Calendar();
+    Incidence * undoIncidence() { return mUndoIncidence; };
+    bool undoDeleteIncidence();
     void deleteIncidence(Incidence *in);
     void resetTempSyncStat();
     void resetPilotStat(int id);
     /**
@@ -321,8 +323,9 @@ public:
     */
     virtual QPtrList<Event> rawEvents( const QDate &start, const QDate &end,
                                        bool inclusive = false ) = 0; 
     Incidence *mNextAlarmIncidence;
+    Incidence *mUndoIncidence;
 
 private:
     void init();
   
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 3f46d53..12294c0 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -151,10 +151,10 @@ bool CalendarLocal::addEvent( Event *event )
 }
 
 void CalendarLocal::deleteEvent( Event *event )
 {
- 
-
+    if ( mUndoIncidence ) delete mUndoIncidence;
+    mUndoIncidence = event->clone();
   if ( mEventList.removeRef( event ) ) {
     setModified( true );
   }
 }
@@ -200,8 +200,10 @@ bool CalendarLocal::addTodo( Todo *todo )
 
 void CalendarLocal::deleteTodo( Todo *todo )
 {
   // Handle orphaned children
+    if ( mUndoIncidence ) delete mUndoIncidence;
+    mUndoIncidence = todo->clone();
   removeRelations( todo );
 
   if ( mTodoList.removeRef( todo ) ) {
     setModified( true );
@@ -686,8 +688,11 @@ bool CalendarLocal::addJournal(Journal *journal)
 }
 
 void CalendarLocal::deleteJournal( Journal *journal )
 {
+    if ( mUndoIncidence ) delete mUndoIncidence;
+    mUndoIncidence = journal->clone();
+    mUndoIncidence->setSummary( mUndoIncidence->description().left(25));
   if ( mJournalList.removeRef(journal) ) {
     setModified( true );
   }
 }
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 5a9ef0e..28402ae 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -172,8 +172,22 @@ bool KCal::operator==( const Incidence& i1, const Incidence& i2 )
         i1.priority() == i2.priority() &&
         stringCompare( i1.location(), i2.location() );
 }
 
+Incidence* Incidence::recreateCloneException( QDate d  )
+{
+    Incidence* newInc = clone();
+    newInc->recreate();
+    if ( doesRecur() ) {
+        addExDate( d );
+        newInc->recurrence()->unsetRecurs();
+        int len = dtStart().secsTo( ((Event*)this)->dtEnd());
+        QTime tim = dtStart().time();
+        newInc->setDtStart( QDateTime(d, tim) );
+        ((Event*)newInc)->setDtEnd( newInc->dtStart().addSecs( len ) );
+    }
+    return newInc;
+}
 
 void Incidence::recreate()
 {
   setCreated(QDateTime::currentDateTime());
diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index 7dc6f10..1807bc4 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -121,8 +121,9 @@ class Incidence : public IncidenceBase
       event information is preserved. Sets uniquie id, creation date, last
       modification date and revision number.
     */
     void recreate();
+    Incidence*  recreateCloneException(QDate);
 
     /** set creation date */
     void setCreated(QDateTime);
     /** return time and date of creation. */