-rw-r--r-- | library/datebookdb.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/datebookdb.cpp b/library/datebookdb.cpp index 2f33255..000ff71 100644 --- a/library/datebookdb.cpp +++ b/library/datebookdb.cpp | |||
@@ -834,25 +834,25 @@ void DateBookDB::loadFile( const QString &strFile ) | |||
834 | else if ( value == "MonthlyDay" ) | 834 | else if ( value == "MonthlyDay" ) |
835 | rp.type = Event::MonthlyDay; | 835 | rp.type = Event::MonthlyDay; |
836 | else if ( value == "MonthlyDate" ) | 836 | else if ( value == "MonthlyDate" ) |
837 | rp.type = Event::MonthlyDate; | 837 | rp.type = Event::MonthlyDate; |
838 | else if ( value == "Yearly" ) | 838 | else if ( value == "Yearly" ) |
839 | rp.type = Event::Yearly; | 839 | rp.type = Event::Yearly; |
840 | else | 840 | else |
841 | rp.type = Event::NoRepeat; | 841 | rp.type = Event::NoRepeat; |
842 | break; | 842 | break; |
843 | case FRWeekdays: | 843 | case FRWeekdays: |
844 | // QtopiaDesktop 1.6 sometimes creates 'rweekdays="0"' | 844 | // QtopiaDesktop 1.6 sometimes creates 'rweekdays="0"' |
845 | // when it goes mad. This causes datebook to crash.. (se) | 845 | // when it goes mad. This causes datebook to crash.. (se) |
846 | if ( value.toInt() != 0 ) | 846 | if ( value.toInt() != 0 ) |
847 | rp.days = value.toInt(); | 847 | rp.days = value.toInt(); |
848 | else | 848 | else |
849 | rp.days = 1; | 849 | rp.days = 1; |
850 | break; | 850 | break; |
851 | case FRPosition: | 851 | case FRPosition: |
852 | rp.position = value.toInt(); | 852 | rp.position = value.toInt(); |
853 | break; | 853 | break; |
854 | case FRFreq: | 854 | case FRFreq: |
855 | rp.frequency = value.toInt(); | 855 | rp.frequency = value.toInt(); |
856 | break; | 856 | break; |
857 | case FRHasEndDate: | 857 | case FRHasEndDate: |
858 | rp.hasEndDate = value.toInt(); | 858 | rp.hasEndDate = value.toInt(); |
@@ -1031,25 +1031,25 @@ void DateBookDB::reload() | |||
1031 | } | 1031 | } |
1032 | eventList.clear(); | 1032 | eventList.clear(); |
1033 | repeatEvents.clear(); // should be a NOP | 1033 | repeatEvents.clear(); // should be a NOP |
1034 | init(); | 1034 | init(); |
1035 | } | 1035 | } |
1036 | 1036 | ||
1037 | bool DateBookDB::removeRepeat( const Event &ev ) | 1037 | bool DateBookDB::removeRepeat( const Event &ev ) |
1038 | { | 1038 | { |
1039 | time_t removeMe = ev.repeatPattern().createTime; | 1039 | time_t removeMe = ev.repeatPattern().createTime; |
1040 | QValueListIterator<Event> it; | 1040 | QValueListIterator<Event> it; |
1041 | for ( it = repeatEvents.begin(); it != repeatEvents.end(); ++it ) { | 1041 | for ( it = repeatEvents.begin(); it != repeatEvents.end(); ++it ) { |
1042 | if ( removeMe == (*it).repeatPattern().createTime ) { | 1042 | if ( removeMe == (*it).repeatPattern().createTime ) { |
1043 | repeatEvents.remove( *it ); | 1043 | (void)repeatEvents.remove( it ); |
1044 | // best break, or we are going into undefined territory! | 1044 | // best break, or we are going into undefined territory! |
1045 | return TRUE; | 1045 | return TRUE; |
1046 | } | 1046 | } |
1047 | } | 1047 | } |
1048 | return FALSE; | 1048 | return FALSE; |
1049 | } | 1049 | } |
1050 | 1050 | ||
1051 | bool DateBookDB::origRepeat( const Event &ev, Event &orig ) const | 1051 | bool DateBookDB::origRepeat( const Event &ev, Event &orig ) const |
1052 | { | 1052 | { |
1053 | time_t removeMe = ev.repeatPattern().createTime; | 1053 | time_t removeMe = ev.repeatPattern().createTime; |
1054 | QValueListConstIterator<Event> it; | 1054 | QValueListConstIterator<Event> it; |
1055 | for ( it = repeatEvents.begin(); it != repeatEvents.end(); ++it ) { | 1055 | for ( it = repeatEvents.begin(); it != repeatEvents.end(); ++it ) { |