| -rw-r--r-- | library/datebookdb.cpp | 25 | ||||
| -rw-r--r-- | library/datebookdb.h | 3 |
2 files changed, 27 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 @@ -463,2 +463,5 @@ 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); @@ -505,2 +508,4 @@ QValueList<EffectiveEvent> DateBookDB::getEffectiveEvents( const QDate &from, for ( it = repeatEvents.begin(); it != repeatEvents.end(); ++it ) { + if (!(*it).isValidUid()) + (*it).assignUid(); // FIXME: Hack to restore cleared uids @@ -584,2 +589,15 @@ 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); +} + @@ -617,2 +635,3 @@ void DateBookDB::editEvent( const Event &old, Event &editedEv ) + // Delete old event if ( old.hasAlarm() ) @@ -620,3 +639,4 @@ void DateBookDB::editEvent( const Event &old, Event &editedEv ) 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 @@ -632,2 +652,4 @@ void DateBookDB::editEvent( const Event &old, Event &editedEv ) } + + // Add new event if ( editedEv.hasAlarm() ) @@ -638,2 +660,3 @@ void DateBookDB::editEvent( const Event &old, Event &editedEv ) eventList.append( editedEv ); + d->clean = false; diff --git a/library/datebookdb.h b/library/datebookdb.h index aadb397..e4c251c 100644 --- a/library/datebookdb.h +++ b/library/datebookdb.h @@ -46,2 +46,3 @@ public: QValueList<EffectiveEvent> getEffectiveEvents( const QDateTime &start ); + Event getEvent( int uid ); @@ -80,2 +81,4 @@ private: QFile journalFile; + + int recordIdMax; // ADDITION }; |