From 3cd0013c04172b312ee21e80224a3b7734b4d413 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Fri, 25 Nov 2005 23:24:37 +0000
Subject: sync

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

diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index c82ea92..b02f706 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -149,12 +149,12 @@ bool CalendarLocal::mergeCalendar( Calendar* remote  )
                 int calID = inL->calID();
                 deleteIncidence( inL );
                 inL = inR->clone();
-                inL->setCalID( calID );
+                inL->setCalID_block( calID );
                 addIncidence( inL );
             }
         } else {
             inL = inR->clone();
-            inL->setCalID( 0 );// add to default cal
+            inL->setCalID_block( 0 );// add to default cal
             addIncidence( inL );
         }
         inR = er.next();
@@ -208,7 +208,7 @@ void CalendarLocal::addCalendar( Calendar* cal )
                 Event * se = event( ev->uid() );
                 if ( se )
                     el.append( se );    
-                ev->setCalID( 1 );
+                ev->setCalID_block( 1 );
             }
             ev->unRegisterObserver( cal );
             ev->registerObserver( this );
@@ -342,7 +342,7 @@ bool CalendarLocal::addEvent( Event *event )
 
   setModified( true );
   if ( event->calID() == 0 )
-      event->setCalID( mDefaultCalendar );
+      event->setCalID_block( mDefaultCalendar );
   event->setCalEnabled( true );
 
   return true;
@@ -396,7 +396,7 @@ bool CalendarLocal::addTodo( Todo *todo )
 
   setModified( true );
   if ( todo->calID() == 0 )
-  todo->setCalID( mDefaultCalendar );
+  todo->setCalID_block( mDefaultCalendar );
   todo->setCalEnabled( true );
   return true;
 }
@@ -924,7 +924,7 @@ bool CalendarLocal::addJournal(Journal *journal)
 
   setModified( true );
   if ( journal->calID() == 0 )
-      journal->setCalID( mDefaultCalendar );
+      journal->setCalID_block( mDefaultCalendar );
   journal->setCalEnabled( true );
   return true;
 }
--
cgit v0.9.0.2