1 files changed, 31 insertions, 0 deletions

diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 8ff8b14..3c572f0 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -51,96 +51,127 @@ CalendarLocal::CalendarLocal()
   init();
 }
 
 CalendarLocal::CalendarLocal(const QString &timeZoneId)
   : Calendar(timeZoneId)
 {
   init();
 }
 
 void CalendarLocal::init()
 {
     mNextAlarmIncidence = 0;
 }
 
 
 CalendarLocal::~CalendarLocal()
 {
   close();
 }
 
 bool CalendarLocal::load( const QString &fileName )
 {
   FileStorage storage( this, fileName );
   return storage.load();
 }
 
 bool CalendarLocal::save( const QString &fileName, CalFormat *format )
 {
   FileStorage storage( this, fileName, format );
   return storage.save();
 }
 
 void CalendarLocal::close()
 {
   mEventList.setAutoDelete( true );
   mTodoList.setAutoDelete( true );
   mJournalList.setAutoDelete( false );
 
   mEventList.clear();
   mTodoList.clear();
   mJournalList.clear();
 
   mEventList.setAutoDelete( false );
   mTodoList.setAutoDelete( false );
   mJournalList.setAutoDelete( false );
 
   setModified( false );
 }
+    
+bool CalendarLocal::addAnniversaryNoDup( Event *event )
+{
+    QString cat;
+    bool isBirthday = true;
+    if(  event->categoriesStr() == i18n( "Anniversary" ) ) {
+        isBirthday = false;
+        cat = i18n( "Anniversary" );
+    } else if(  event->categoriesStr() == i18n( "Birthday" ) ) {
+        isBirthday = true;
+        cat = i18n( "Birthday" );
+    } else {
+        qDebug("addAnniversaryNoDup called without fitting category! ");
+        return false;
+    }
+    Event * eve;
+    for ( eve = mEventList.first(); eve ; eve = mEventList.next() ) {
+        if ( !(eve->categories().contains( cat ) ))
+            continue;
+        // now we have an event with fitting category
+        if ( eve->dtStart().date() != event->dtStart().date() )
+            continue;
+        // now we have an event with fitting category+date
+        if ( eve->summary() != event->summary() )
+            continue;
+        // now we have an event with fitting category+date+summary
+        return false;
+    }
+    return addEvent( event );
+
+}
 bool CalendarLocal::addEventNoDup( Event *event )
 {
     Event * eve;
     for ( eve = mEventList.first(); eve ; eve = mEventList.next() ) {
         if ( *eve == *event ) {
             //qDebug("CalendarLocal::Duplicate event found! Not inserted! ");
             return false;
         }
     }
     return addEvent( event );
 }
 
 bool CalendarLocal::addEvent( Event *event )
 {
   insertEvent( event );
 
   event->registerObserver( this );
 
   setModified( true );
 
   return true;
 }
 
 void CalendarLocal::deleteEvent( Event *event )
 {
  
 
   if ( mEventList.removeRef( event ) ) {
     setModified( true );
   }
 }
 
 
 Event *CalendarLocal::event( const QString &uid )
 {
 
   Event *event;
 
   for ( event = mEventList.first(); event; event = mEventList.next() ) {
     if ( event->uid() == uid ) {
       return event;
     }
   }
 
   return 0;
 }
 bool CalendarLocal::addTodoNoDup( Todo *todo )
 {