From f731dd9fc5b3f14c44d4de26eb5370a79c63887c Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Sat, 09 Jul 2005 08:48:32 +0000
Subject: fixi

---
(limited to 'libkcal/calendarlocal.h')

diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h
index 98d16a3..23b0542 100644
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@@ -45,6 +45,9 @@ class CalendarLocal : public Calendar
     ~CalendarLocal();
     void addCalendar( Calendar*  );
     bool addCalendarFile( QString name, int id );
+    bool mergeCalendarFile( QString name );
+    bool mergeCalendar( Calendar* cal );
+    Incidence* incidenceForUid( const QString& uid );
     void setSyncEventsReadOnly();
     void stopAllTodos();
     /**
--
cgit v0.9.0.2