Fix inline for Event::start

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
@@ -395,65 +395,65 @@ int Event::occurrence( const QDate& date )
 /*!
   \internal
 */
 int Event::dayOfWeek( char day )
 {
     int dayOfWeek = 1;
     char i = Event::MON;
     while ( !( i & day ) && i <= Event::SUN ) {
         i <<= 1;
         ++dayOfWeek;
     }
     return dayOfWeek;
 }
 
 /*!
   \internal
 */
 int Event::monthDiff( const QDate& first, const QDate& second )
 {
     return ( second.year() - first.year() ) * 12 +
         second.month() - first.month();
 }
 
 /*!
   \internal
 */
 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() )
         m.insert ( Note, notes() );
 
     m.insert ( StartDateTime, QString::number( TimeConversion::toUTC( start() ) ) );
     m.insert ( EndDateTime, QString::number( TimeConversion::toUTC( end() ) ) );
     m.insert ( DatebookType, QString::number( (int)type() ) );
     m.insert ( HasAlarm, ( hasAlarm() ? "1" : "0" ) );
     m.insert ( SoundType, QString::number( (int)alarmSound() ) );
     m.insert ( AlarmTime, QString::number( alarmTime() ) );
     m.insert ( RepeatPatternType, QString::number( static_cast<int>( repeatPattern().type ) ) );
     m.insert ( RepeatPatternFrequency, QString::number( repeatPattern().frequency ) );
     m.insert ( RepeatPatternPosition, QString::number( repeatPattern().position ) );
     m.insert ( RepeatPatternDays, QString::number( repeatPattern().days ) );
     m.insert ( RepeatPatternHasEndDate, QString::number( static_cast<int>( repeatPattern().hasEndDate ) ) );
     m.insert ( RepeatPatternEndDate, QString::number( repeatPattern().endDateUTC ) );
 
     m.insert( DatebookUid, QString::number( uid()) );
 
     return m;
 }
 
 /*!
   \internal
 */
 void Event::setRepeat( const RepeatPattern &p )
 {
     setRepeat( p.type != NoRepeat, p );
@@ -556,80 +556,85 @@ 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;
 }
 
 /*!
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
@@ -239,67 +239,67 @@ public:
 
     QDate startDate() const;
     QDate endDate() const;
 
 private:
     class EffectiveEventPrivate *d;
     Event mEvent;
     QDate mDate;
     QTime mStart,
           mEnd;
 
 };
 
 inline void Event::setAlarm( int minutes, SoundTypeChoice s )
 {
     setAlarm(TRUE, minutes, s);
 }
 
 inline void Event::clearAlarm()
 {
     setAlarm(FALSE, 0, Silent);
 }
 
 inline int Event::alarmDelay() const
 {
     return alarmTime();
 }
 
 inline void Event::setAllDay(bool enable)
 {
     if (enable)
         setType(AllDay);
-    else 
+    else
         setType(Normal);
-}; 
+};
 
 inline bool Event::isAllDay() const
 {
     return type() == AllDay;
 }
 
 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;
 }
@@ -312,64 +312,64 @@ inline void Event::setRepeatType(RepeatType 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