-rw-r--r-- | libopie/pim/oevent.cpp | 14 | ||||
-rw-r--r-- | libopie2/opiepim/oevent.cpp | 14 |
2 files changed, 20 insertions, 8 deletions
diff --git a/libopie/pim/oevent.cpp b/libopie/pim/oevent.cpp index 56ea10d..3ba8a52 100644 --- a/libopie/pim/oevent.cpp +++ b/libopie/pim/oevent.cpp | |||
@@ -233,37 +233,43 @@ int OEvent::rtti() { | |||
233 | bool OEvent::loadFromStream( QDataStream& ) { | 233 | bool OEvent::loadFromStream( QDataStream& ) { |
234 | return true; | 234 | return true; |
235 | } | 235 | } |
236 | bool OEvent::saveToStream( QDataStream& )const { | 236 | bool OEvent::saveToStream( QDataStream& )const { |
237 | return true; | 237 | return true; |
238 | } | 238 | } |
239 | void OEvent::changeOrModify() { | 239 | void OEvent::changeOrModify() { |
240 | if ( data->count != 1 ) { | 240 | if ( data->count != 1 ) { |
241 | data->deref(); | 241 | data->deref(); |
242 | Data* d2 = new Data; | 242 | Data* d2 = new Data; |
243 | d2->description = data->description; | 243 | d2->description = data->description; |
244 | d2->location = data->location; | 244 | d2->location = data->location; |
245 | d2->manager = data->manager; | 245 | |
246 | d2->recur = data->recur; | 246 | if (data->manager ) |
247 | d2->manager = new OPimNotifyManager( *data->manager ); | ||
248 | |||
249 | if ( data->recur ) | ||
250 | d2->recur = new ORecur( *data->recur ); | ||
251 | |||
247 | d2->note = data->note; | 252 | d2->note = data->note; |
248 | d2->created = data->created; | 253 | d2->created = data->created; |
249 | d2->start = data->start; | 254 | d2->start = data->start; |
250 | d2->end = data->end; | 255 | d2->end = data->end; |
251 | d2->isAllDay = data->isAllDay; | 256 | d2->isAllDay = data->isAllDay; |
252 | d2->timezone = data->timezone; | 257 | d2->timezone = data->timezone; |
253 | d2->parent = data->parent; | 258 | d2->parent = data->parent; |
254 | d2->child = data->child; | ||
255 | 259 | ||
256 | if (d2->child ) | 260 | if ( data->child ) { |
261 | d2->child = new QArray<int>( *data->child ); | ||
257 | d2->child->detach(); | 262 | d2->child->detach(); |
263 | } | ||
258 | 264 | ||
259 | data = d2; | 265 | data = d2; |
260 | } | 266 | } |
261 | } | 267 | } |
262 | void OEvent::deref() { | 268 | void OEvent::deref() { |
263 | if ( data->deref() ) { | 269 | if ( data->deref() ) { |
264 | delete data; | 270 | delete data; |
265 | data = 0; | 271 | data = 0; |
266 | } | 272 | } |
267 | } | 273 | } |
268 | // FIXME | 274 | // FIXME |
269 | QMap<int, QString> OEvent::toMap()const { | 275 | QMap<int, QString> OEvent::toMap()const { |
diff --git a/libopie2/opiepim/oevent.cpp b/libopie2/opiepim/oevent.cpp index 56ea10d..3ba8a52 100644 --- a/libopie2/opiepim/oevent.cpp +++ b/libopie2/opiepim/oevent.cpp | |||
@@ -233,37 +233,43 @@ int OEvent::rtti() { | |||
233 | bool OEvent::loadFromStream( QDataStream& ) { | 233 | bool OEvent::loadFromStream( QDataStream& ) { |
234 | return true; | 234 | return true; |
235 | } | 235 | } |
236 | bool OEvent::saveToStream( QDataStream& )const { | 236 | bool OEvent::saveToStream( QDataStream& )const { |
237 | return true; | 237 | return true; |
238 | } | 238 | } |
239 | void OEvent::changeOrModify() { | 239 | void OEvent::changeOrModify() { |
240 | if ( data->count != 1 ) { | 240 | if ( data->count != 1 ) { |
241 | data->deref(); | 241 | data->deref(); |
242 | Data* d2 = new Data; | 242 | Data* d2 = new Data; |
243 | d2->description = data->description; | 243 | d2->description = data->description; |
244 | d2->location = data->location; | 244 | d2->location = data->location; |
245 | d2->manager = data->manager; | 245 | |
246 | d2->recur = data->recur; | 246 | if (data->manager ) |
247 | d2->manager = new OPimNotifyManager( *data->manager ); | ||
248 | |||
249 | if ( data->recur ) | ||
250 | d2->recur = new ORecur( *data->recur ); | ||
251 | |||
247 | d2->note = data->note; | 252 | d2->note = data->note; |
248 | d2->created = data->created; | 253 | d2->created = data->created; |
249 | d2->start = data->start; | 254 | d2->start = data->start; |
250 | d2->end = data->end; | 255 | d2->end = data->end; |
251 | d2->isAllDay = data->isAllDay; | 256 | d2->isAllDay = data->isAllDay; |
252 | d2->timezone = data->timezone; | 257 | d2->timezone = data->timezone; |
253 | d2->parent = data->parent; | 258 | d2->parent = data->parent; |
254 | d2->child = data->child; | ||
255 | 259 | ||
256 | if (d2->child ) | 260 | if ( data->child ) { |
261 | d2->child = new QArray<int>( *data->child ); | ||
257 | d2->child->detach(); | 262 | d2->child->detach(); |
263 | } | ||
258 | 264 | ||
259 | data = d2; | 265 | data = d2; |
260 | } | 266 | } |
261 | } | 267 | } |
262 | void OEvent::deref() { | 268 | void OEvent::deref() { |
263 | if ( data->deref() ) { | 269 | if ( data->deref() ) { |
264 | delete data; | 270 | delete data; |
265 | data = 0; | 271 | data = 0; |
266 | } | 272 | } |
267 | } | 273 | } |
268 | // FIXME | 274 | // FIXME |
269 | QMap<int, QString> OEvent::toMap()const { | 275 | QMap<int, QString> OEvent::toMap()const { |