-rw-r--r-- | libkcal/calendar.cpp | 2 | ||||
-rw-r--r-- | libkcal/calendarlocal.cpp | 12 | ||||
-rw-r--r-- | libkcal/incidencebase.cpp | 7 | ||||
-rw-r--r-- | libkcal/incidencebase.h | 1 |
4 files changed, 15 insertions, 7 deletions
diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp index b1806ee..8535191 100644 --- a/libkcal/calendar.cpp +++ b/libkcal/calendar.cpp | |||
@@ -381,5 +381,5 @@ bool Calendar::addIncidence(Incidence *i) | |||
381 | Incidence::AddVisitor<Calendar> v(this); | 381 | Incidence::AddVisitor<Calendar> v(this); |
382 | if ( i->calID() == 0 ) | 382 | if ( i->calID() == 0 ) |
383 | i->setCalID( mDefaultCalendar ); | 383 | i->setCalID_block( mDefaultCalendar ); |
384 | i->setCalEnabled( true ); | 384 | i->setCalEnabled( true ); |
385 | return i->accept(v); | 385 | return i->accept(v); |
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index c82ea92..b02f706 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp | |||
@@ -150,10 +150,10 @@ bool CalendarLocal::mergeCalendar( Calendar* remote ) | |||
150 | deleteIncidence( inL ); | 150 | deleteIncidence( inL ); |
151 | inL = inR->clone(); | 151 | inL = inR->clone(); |
152 | inL->setCalID( calID ); | 152 | inL->setCalID_block( calID ); |
153 | addIncidence( inL ); | 153 | addIncidence( inL ); |
154 | } | 154 | } |
155 | } else { | 155 | } else { |
156 | inL = inR->clone(); | 156 | inL = inR->clone(); |
157 | inL->setCalID( 0 );// add to default cal | 157 | inL->setCalID_block( 0 );// add to default cal |
158 | addIncidence( inL ); | 158 | addIncidence( inL ); |
159 | } | 159 | } |
@@ -209,5 +209,5 @@ void CalendarLocal::addCalendar( Calendar* cal ) | |||
209 | if ( se ) | 209 | if ( se ) |
210 | el.append( se ); | 210 | el.append( se ); |
211 | ev->setCalID( 1 ); | 211 | ev->setCalID_block( 1 ); |
212 | } | 212 | } |
213 | ev->unRegisterObserver( cal ); | 213 | ev->unRegisterObserver( cal ); |
@@ -343,5 +343,5 @@ bool CalendarLocal::addEvent( Event *event ) | |||
343 | setModified( true ); | 343 | setModified( true ); |
344 | if ( event->calID() == 0 ) | 344 | if ( event->calID() == 0 ) |
345 | event->setCalID( mDefaultCalendar ); | 345 | event->setCalID_block( mDefaultCalendar ); |
346 | event->setCalEnabled( true ); | 346 | event->setCalEnabled( true ); |
347 | 347 | ||
@@ -397,5 +397,5 @@ bool CalendarLocal::addTodo( Todo *todo ) | |||
397 | setModified( true ); | 397 | setModified( true ); |
398 | if ( todo->calID() == 0 ) | 398 | if ( todo->calID() == 0 ) |
399 | todo->setCalID( mDefaultCalendar ); | 399 | todo->setCalID_block( mDefaultCalendar ); |
400 | todo->setCalEnabled( true ); | 400 | todo->setCalEnabled( true ); |
401 | return true; | 401 | return true; |
@@ -925,5 +925,5 @@ bool CalendarLocal::addJournal(Journal *journal) | |||
925 | setModified( true ); | 925 | setModified( true ); |
926 | if ( journal->calID() == 0 ) | 926 | if ( journal->calID() == 0 ) |
927 | journal->setCalID( mDefaultCalendar ); | 927 | journal->setCalID_block( mDefaultCalendar ); |
928 | journal->setCalEnabled( true ); | 928 | journal->setCalEnabled( true ); |
929 | return true; | 929 | return true; |
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp index cfef973..56c0560 100644 --- a/libkcal/incidencebase.cpp +++ b/libkcal/incidencebase.cpp | |||
@@ -153,4 +153,11 @@ void IncidenceBase::setCalID( int id ) | |||
153 | { | 153 | { |
154 | if ( mCalID > 0 ) { | 154 | if ( mCalID > 0 ) { |
155 | updated(); | ||
156 | } | ||
157 | mCalID = id; | ||
158 | } | ||
159 | void IncidenceBase::setCalID_block( int id ) | ||
160 | { | ||
161 | if ( mCalID > 0 ) { | ||
155 | blockLastModified = true; | 162 | blockLastModified = true; |
156 | updated(); | 163 | updated(); |
diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h index 444d4c4..3edc03b 100644 --- a/libkcal/incidencebase.h +++ b/libkcal/incidencebase.h | |||
@@ -144,4 +144,5 @@ class IncidenceBase : public CustomProperties | |||
144 | void updated(); | 144 | void updated(); |
145 | void setCalID( int id ); | 145 | void setCalID( int id ); |
146 | void setCalID_block( int id ); | ||
146 | int calID() const; | 147 | int calID() const; |
147 | void setCalEnabled( bool ); | 148 | void setCalEnabled( bool ); |