| -rw-r--r-- | library/backend/event.cpp | 5 | ||||
| -rw-r--r-- | library/backend/event.h | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/library/backend/event.cpp b/library/backend/event.cpp index 8f3f780..7cac314 100644 --- a/library/backend/event.cpp +++ b/library/backend/event.cpp @@ -524,149 +524,152 @@ void Event::setEnd( time_t time ) /*! \internal */ void Event::setTimeZone( const QString &z ) { tz = z; } /*! \internal */ void Event::setAlarm( bool b, int minutes, SoundTypeChoice s ) { hAlarm = b; aMinutes = minutes; aSound = s; } /*! \internal */ void Event::setRepeat( bool b, const RepeatPattern &p ) { hRepeat = b; pattern = p; } /*! Sets the notes for the event to \a n. */ void Event::setNotes( const QString &n ) { note = n; } /*! Returns the description of the event. */ const QString &Event::description() const { return descript; } /*! Returns the location of the event. */ const QString &Event::location() const { return locat; } // QString Event::category() const // { // return categ; // } /*! \internal */ Event::Type Event::type() const { return typ; } +/* QDateTime Event::start() const { return start( TRUE ); } +*/ /*! \internal */ QDateTime Event::start( bool actual ) const { QDateTime dt = (startUTC > 0) ? TimeConversion::fromUTC( startUTC ) : QDateTime::currentDateTime(); if ( actual && typ == AllDay ) { QTime t = dt.time(); t.setHMS( 0, 0, 0 ); dt.setTime( t ); } return dt; } - +/* QDateTime Event::end() const { return end( TRUE ); } +*/ /*! \internal */ QDateTime Event::end( bool actual ) const { QDateTime dt = (endUTC > 0) ? TimeConversion::fromUTC( endUTC ) : QDateTime::currentDateTime(); if ( actual && typ == AllDay ) { QTime t = dt.time(); t.setHMS( 23, 59, 59 ); dt.setTime( t ); } return dt; } /*! \internal */ const QString &Event::timeZone() const { return tz; } /*! \internal */ bool Event::hasAlarm() const { return hAlarm; } /*! \internal */ int Event::alarmTime() const { return aMinutes; } /*! Returns the sound type for the alarm of this event. */ Event::SoundTypeChoice Event::alarmSound() const { return aSound; } /*! \internal */ bool Event::hasRepeat() const { return doRepeat(); } /*! \internal */ const Event::RepeatPattern &Event::repeatPattern() const { return pattern; } /*! diff --git a/library/backend/event.h b/library/backend/event.h index 2b275a4..4610d85 100644 --- a/library/backend/event.h +++ b/library/backend/event.h @@ -280,96 +280,96 @@ inline bool Event::isAllDay() const inline Event::RepeatType Event::repeatType() const { return repeatPattern().type; } inline int Event::frequency() const { return repeatPattern().frequency; } inline int Event::weekOffset() const { if (start().date().day() == 1) return 1; return (start().date().day() - 1) / 7 + 1; } inline QDate Event::repeatTill() const { return repeatPattern().endDate(); } inline bool Event::repeatForever() const { return !repeatPattern().hasEndDate; } inline void Event::setRepeatType(RepeatType t) { pattern.type = t; } inline void Event::setFrequency(int f) { pattern.frequency = f; } inline void Event::setRepeatTill(const QDate &d) { pattern.setEndDate(d); pattern.hasEndDate = TRUE; } inline void Event::setRepeatForever(bool b) { if (!b == pattern.hasEndDate) return; if (!b && !pattern.hasEndDate) pattern.setEndDate(end().date()); pattern.hasEndDate = !b; } inline bool Event::repeatOnWeekDay(int day) const { if (pattern.type != Weekly) return FALSE; return ( (1 << (day - 1)) & pattern.days ) != 0; } inline void Event::setRepeatOnWeekDay(int day, bool enable) { if ( repeatOnWeekDay( day ) != enable ) pattern.days ^= 1 << (day - 1); } -/* + inline QDateTime Event::start( ) const { return start(FALSE); } inline QDateTime Event::end( ) const { return end(FALSE); } -*/ + #ifdef PALMTOPCENTER class QPC_EXPORT EffectiveEventSizeSorter : public QSorter<EffectiveEvent> { public: int compare( const EffectiveEvent& a, const EffectiveEvent& b ) const { return a.size() - b.size(); } }; class QPC_EXPORT EffectiveEventTimeSorter : public QSorter<EffectiveEvent> { public: int compare( const EffectiveEvent& a, const EffectiveEvent& b ) const { return a.start().secsTo( b.start() ); } }; #endif #endif |