| -rw-r--r-- | library/backend/event.cpp | 9 | ||||
| -rw-r--r-- | library/backend/event.h | 8 |
2 files changed, 11 insertions, 6 deletions
diff --git a/library/backend/event.cpp b/library/backend/event.cpp index 7110717..8f3f780 100644 --- a/library/backend/event.cpp +++ b/library/backend/event.cpp @@ -421,13 +421,13 @@ int Event::monthDiff( const QDate& first, const QDate& second ) QMap<int, QString> Event::toMap() const { QMap<int, QString> m; if ( !description().isEmpty() ) m.insert( DatebookDescription, description() ); - if ( !location().isEmpty() ) + if ( !location().isEmpty() ) m.insert ( Location, location() ); if ( categories().count() ) m.insert ( DatebookCategory, idsToString( categories() ) ); if ( !timeZone().isEmpty() ) m.insert ( TimeZone, timeZone() ); if ( !notes().isEmpty() ) @@ -582,13 +582,15 @@ const QString &Event::location() const \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(); @@ -598,12 +600,15 @@ QDateTime Event::start( bool actual ) const 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(); diff --git a/library/backend/event.h b/library/backend/event.h index 7fe41a5..2b275a4 100644 --- a/library/backend/event.h +++ b/library/backend/event.h @@ -265,15 +265,15 @@ inline int Event::alarmDelay() const } inline void Event::setAllDay(bool enable) { if (enable) setType(AllDay); - else + else setType(Normal); -}; +}; inline bool Event::isAllDay() const { return type() == AllDay; } @@ -338,23 +338,23 @@ inline bool Event::repeatOnWeekDay(int day) const 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 { |