| -rw-r--r-- | library/datebookdb.cpp | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/library/datebookdb.cpp b/library/datebookdb.cpp index bf7fd94..da5a797 100644 --- a/library/datebookdb.cpp +++ b/library/datebookdb.cpp @@ -462,4 +462,7 @@ QValueList<EffectiveEvent> DateBookDB::getEffectiveEvents( const QDate &from, for (it = eventList.begin(); it != eventList.end(); ++it ) { + if (!(*it).isValidUid()) + (*it).assignUid(); // FIXME: Hack to restore cleared uids + dtTmp = (*it).start(TRUE); dtEnd = (*it).end(TRUE); @@ -504,4 +507,6 @@ QValueList<EffectiveEvent> DateBookDB::getEffectiveEvents( const QDate &from, QDateTime repeat; for ( it = repeatEvents.begin(); it != repeatEvents.end(); ++it ) { + if (!(*it).isValidUid()) + (*it).assignUid(); // FIXME: Hack to restore cleared uids /* create a false end date, to short circuit on hard @@ -583,4 +588,17 @@ QValueList<EffectiveEvent> DateBookDB::getEffectiveEvents( const QDateTime &dt) } +Event DateBookDB::getEvent( int uid ) { + QValueList<Event>::ConstIterator it; + + for (it = eventList.begin(); it != eventList.end(); it++) { + if ((*it).uid() == uid) return *it; + } + for (it = repeatEvents.begin(); it != repeatEvents.end(); it++) { + if ((*it).uid() == uid) return *it; + } + + qDebug("Event not found: uid=%d\n", uid); +} + void DateBookDB::addEvent( const Event &ev, bool doalarm ) @@ -616,8 +634,10 @@ void DateBookDB::editEvent( const Event &old, Event &editedEv ) saveJournalEntry( editedEv, ACTION_REPLACE, oldIndex, oldHadRepeat ); + // Delete old event if ( old.hasAlarm() ) delEventAlarm( old ); if ( oldHadRepeat ) { - if ( oldHadRepeat && editedEv.hasRepeat() ) { + if ( editedEv.hasRepeat() ) { // This mean that origRepeat was run above and + // orig is initialized // assumption, when someone edits a repeating event, they // want to change them all, maybe not perfect, but it works @@ -631,4 +651,6 @@ void DateBookDB::editEvent( const Event &old, Event &editedEv ) eventList.remove( it ); } + + // Add new event if ( editedEv.hasAlarm() ) addEventAlarm( editedEv ); @@ -637,4 +659,5 @@ void DateBookDB::editEvent( const Event &old, Event &editedEv ) else eventList.append( editedEv ); + d->clean = false; } |