author | zecke <zecke> | 2002-09-21 11:06:13 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-21 11:06:13 (UTC) |
commit | 90b5f15ac863d5eb833d2d9e832b43d05c4079a4 (patch) (unidiff) | |
tree | 7ef87033f2e204d29090f0fe40b9ae0c296a1b5f | |
parent | 51f94f502b2b9a92d562a3ad726ad58372860c5e (diff) | |
download | opie-90b5f15ac863d5eb833d2d9e832b43d05c4079a4.zip opie-90b5f15ac863d5eb833d2d9e832b43d05c4079a4.tar.gz opie-90b5f15ac863d5eb833d2d9e832b43d05c4079a4.tar.bz2 |
Make end inline again
-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 | |||
@@ -580,37 +580,40 @@ const QString &Event::location() const | |||
580 | 580 | ||
581 | /*! | 581 | /*! |
582 | \internal | 582 | \internal |
583 | */ | 583 | */ |
584 | Event::Type Event::type() const | 584 | Event::Type Event::type() const |
585 | { | 585 | { |
586 | return typ; | 586 | return typ; |
587 | } | 587 | } |
588 | /* | ||
588 | QDateTime Event::start() const { | 589 | QDateTime Event::start() const { |
589 | return start( TRUE ); | 590 | return start( TRUE ); |
590 | } | 591 | } |
592 | */ | ||
591 | /*! | 593 | /*! |
592 | \internal | 594 | \internal |
593 | */ | 595 | */ |
594 | QDateTime Event::start( bool actual ) const | 596 | QDateTime Event::start( bool actual ) const |
595 | { | 597 | { |
596 | QDateTime dt = (startUTC > 0) ? TimeConversion::fromUTC( startUTC ) : QDateTime::currentDateTime(); | 598 | QDateTime dt = (startUTC > 0) ? TimeConversion::fromUTC( startUTC ) : QDateTime::currentDateTime(); |
597 | 599 | ||
598 | if ( actual && typ == AllDay ) { | 600 | if ( actual && typ == AllDay ) { |
599 | QTime t = dt.time(); | 601 | QTime t = dt.time(); |
600 | t.setHMS( 0, 0, 0 ); | 602 | t.setHMS( 0, 0, 0 ); |
601 | dt.setTime( t ); | 603 | dt.setTime( t ); |
602 | } | 604 | } |
603 | return dt; | 605 | return dt; |
604 | } | 606 | } |
605 | 607 | /* | |
606 | QDateTime Event::end() const { | 608 | QDateTime Event::end() const { |
607 | return end( TRUE ); | 609 | return end( TRUE ); |
608 | } | 610 | } |
611 | */ | ||
609 | /*! | 612 | /*! |
610 | \internal | 613 | \internal |
611 | */ | 614 | */ |
612 | QDateTime Event::end( bool actual ) const | 615 | QDateTime Event::end( bool actual ) const |
613 | { | 616 | { |
614 | QDateTime dt = (endUTC > 0) ? TimeConversion::fromUTC( endUTC ) : QDateTime::currentDateTime(); | 617 | QDateTime dt = (endUTC > 0) ? TimeConversion::fromUTC( endUTC ) : QDateTime::currentDateTime(); |
615 | 618 | ||
616 | if ( actual && typ == AllDay ) { | 619 | if ( actual && typ == AllDay ) { |
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 | |||
@@ -336,27 +336,27 @@ inline bool Event::repeatOnWeekDay(int day) const | |||
336 | return ( (1 << (day - 1)) & pattern.days ) != 0; | 336 | return ( (1 << (day - 1)) & pattern.days ) != 0; |
337 | } | 337 | } |
338 | 338 | ||
339 | inline void Event::setRepeatOnWeekDay(int day, bool enable) | 339 | inline void Event::setRepeatOnWeekDay(int day, bool enable) |
340 | { | 340 | { |
341 | if ( repeatOnWeekDay( day ) != enable ) | 341 | if ( repeatOnWeekDay( day ) != enable ) |
342 | pattern.days ^= 1 << (day - 1); | 342 | pattern.days ^= 1 << (day - 1); |
343 | } | 343 | } |
344 | /* | 344 | |
345 | inline QDateTime Event::start( ) const | 345 | inline QDateTime Event::start( ) const |
346 | { | 346 | { |
347 | return start(FALSE); | 347 | return start(FALSE); |
348 | } | 348 | } |
349 | 349 | ||
350 | inline QDateTime Event::end( ) const | 350 | inline QDateTime Event::end( ) const |
351 | { | 351 | { |
352 | return end(FALSE); | 352 | return end(FALSE); |
353 | } | 353 | } |
354 | */ | 354 | |
355 | #ifdef PALMTOPCENTER | 355 | #ifdef PALMTOPCENTER |
356 | class QPC_EXPORT EffectiveEventSizeSorter : public QSorter<EffectiveEvent> | 356 | class QPC_EXPORT EffectiveEventSizeSorter : public QSorter<EffectiveEvent> |
357 | { | 357 | { |
358 | public: | 358 | public: |
359 | int compare( const EffectiveEvent& a, const EffectiveEvent& b ) const | 359 | int compare( const EffectiveEvent& a, const EffectiveEvent& b ) const |
360 | { | 360 | { |
361 | return a.size() - b.size(); | 361 | return a.size() - b.size(); |
362 | } | 362 | } |