1 files changed, 75 insertions, 0 deletions

diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index cce798f..3e42ec0 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -65,12 +65,87 @@ void CalendarLocal::init()
 
 CalendarLocal::~CalendarLocal()
 {
     if ( mDeleteIncidencesOnClose )
         close();
 }
+bool CalendarLocal::mergeCalendarFile( QString name )
+{
+    CalendarLocal calendar( timeZoneId() );
+    calendar.setDefaultCalendar( 1 );
+    if ( calendar.load( name ) ) {
+        mergeCalendar( &calendar  );
+        return true;
+    }
+    return false;
+}
+ 
+Incidence* CalendarLocal::incidenceForUid( const QString& uid )
+{
+    Todo *todo;;
+    Incidence *retVal = 0;
+    for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
+        if ( todo->uid() == uid ) {
+            if ( retVal ) {
+                if ( retVal->calID() > todo->calID() ) {
+                    retVal = todo;
+                }
+            } else {
+                retVal = todo;
+            }
+        } 
+    }
+    if ( retVal ) return retVal;
+    Event *event;
+    for ( event = mEventList.first(); event; event = mEventList.next() ) {
+        if (  event->uid() == uid ) {
+            if ( retVal ) {
+                if ( retVal->calID() > event->calID() ) {
+                    retVal = event;
+                }
+            } else {
+                retVal = event;
+            }
+        }
+    }
+    if ( retVal ) return retVal;
+    for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
+        if ( it->uid() == uid ) {
+            if ( retVal ) {
+                if ( retVal->calID() > it->calID() ) {
+                    retVal = it;
+                }
+            } else {
+                retVal = it;
+            }
+        }
+    return retVal;
+}
+
+bool CalendarLocal::mergeCalendar( Calendar* remote  )
+{
+    QPtrList<Incidence> er = remote->rawIncidences(); 
+    Incidence* inR = er.first();
+    Incidence* inL; 
+    while ( inR ) {
+        inL = incidenceForUid( inR->uid() );
+        if ( inL ) {
+            int calID = inL->calID();
+            deleteIncidence( inL );
+            inL = inR->clone();
+            inL->setCalID( calID );
+            addIncidence( inL );
+        } else {
+            inL = inR->clone();
+            inL->setCalID( 0 );// add to default cal
+            addIncidence( inL );
+        }
+        inR = er.next();
+    }
+    return true;
+}
 bool CalendarLocal::addCalendarFile( QString name, int id )
 {
     CalendarLocal calendar( timeZoneId() );
     calendar.setDefaultCalendar( id );
     if ( calendar.load( name ) ) {
         addCalendar( &calendar  );