Diffstat (limited to 'core/pim/datebook/datebook.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/datebook.cpp | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp index 10a9b59..07d7164 100644 --- a/core/pim/datebook/datebook.cpp +++ b/core/pim/datebook/datebook.cpp | |||
@@ -193,4 +193,6 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | |||
193 | qDebug("done t=%d", t.elapsed() ); | 193 | qDebug("done t=%d", t.elapsed() ); |
194 | 194 | ||
195 | connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) ); | ||
196 | connect( qApp, SIGNAL( reload()), this, SLOT( reload() ) ); | ||
195 | /* | 197 | /* |
196 | * Here is a problem description: | 198 | * Here is a problem description: |
@@ -403,4 +405,6 @@ void DateBook::insertEvent( const Event &e ) | |||
403 | { | 405 | { |
404 | Event dupEvent=e; | 406 | Event dupEvent=e; |
407 | if(!dupEvent.isValidUid() ) // tkcRom seems to be different | ||
408 | dupEvent.assignUid(); | ||
405 | dupEvent.setLocation(defaultLocation); | 409 | dupEvent.setLocation(defaultLocation); |
406 | dupEvent.setCategories(defaultCategories); | 410 | dupEvent.setCategories(defaultCategories); |
@@ -444,13 +448,15 @@ void DateBook::duplicateEvent( const Event &e ) | |||
444 | continue; | 448 | continue; |
445 | } | 449 | } |
446 | /* | 450 | /* |
447 | * The problem: | 451 | * The problem: |
448 | * DateBookDB does remove repeating events not by uid but by the time | 452 | * DateBookDB does remove repeating events not by uid but by the time |
449 | * the recurrence was created | 453 | * the recurrence was created |
450 | * so we need to update that time as well | 454 | * so we need to update that time as well |
451 | */ | 455 | */ |
452 | Event::RepeatPattern rp = newEv.repeatPattern(); | 456 | Event::RepeatPattern rp = newEv.repeatPattern(); |
453 | rp.createTime = ::time( NULL ); | 457 | rp.createTime = ::time( NULL ); |
454 | newEv.setRepeat( TRUE, rp ); // has repeat and repeatPattern... | 458 | newEv.setRepeat( TRUE, rp ); // has repeat and repeatPattern... |
459 | if( newEv.uid() == e.uid() || !newEv.isValidUid() ) | ||
460 | newEv.assignUid(); | ||
455 | 461 | ||
456 | db->addEvent(newEv); | 462 | db->addEvent(newEv); |