summaryrefslogtreecommitdiff
authorwaspe <waspe>2003-11-04 16:59:55 (UTC)
committer waspe <waspe>2003-11-04 16:59:55 (UTC)
commit5865ec3970cead5b2cf3dd255a55cf2e1869e330 (patch) (unidiff)
tree657cab0ca04a93565ee16e79f0aedda63d1923d0
parentda5c9b06fe0081050ab8165cf3d189dbc8117bf6 (diff)
downloadopie-5865ec3970cead5b2cf3dd255a55cf2e1869e330.zip
opie-5865ec3970cead5b2cf3dd255a55cf2e1869e330.tar.gz
opie-5865ec3970cead5b2cf3dd255a55cf2e1869e330.tar.bz2
resloved merge conflict
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/datebookdb.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/library/datebookdb.cpp b/library/datebookdb.cpp
index 000ff71..188d8e1 100644
--- a/library/datebookdb.cpp
+++ b/library/datebookdb.cpp
@@ -93,11 +93,14 @@ bool nextOccurance(const Event &e, const QDate &from, QDateTime &next)
93 for this round */ 93 for this round */
94 // firstOfWeek = 0; this is already done at decl. 94 // firstOfWeek = 0; this is already done at decl.
95 while(!((1 << firstOfWeek) & e.repeatPattern().days)) 95 while(!((1 << firstOfWeek) & e.repeatPattern().days))
96 firstOfWeek++; 96 firstOfWeek++;
97
98
97 99
98 /* there is at least one 'day', or there would be no event */ 100 /* there is at least one 'day', or there would be no event */
99 while(!((1 << (dayOfWeek % 7)) & e.repeatPattern().days)) 101 while(!((1 << (dayOfWeek % 7)) & e.repeatPattern().days))
100 dayOfWeek++; 102 dayOfWeek++;
103
101 104
102 dayOfWeek = dayOfWeek % 7; /* the actual day of week */ 105 dayOfWeek = dayOfWeek % 7; /* the actual day of week */
103 dayOfWeek -= e.start().date().dayOfWeek() -1; 106 dayOfWeek -= e.start().date().dayOfWeek() -1;
@@ -891,6 +894,13 @@ void DateBookDB::loadFile( const QString &strFile )
891#endif 894#endif
892 } 895 }
893 // "post processing" (dates, times, alarm, recurrence) 896 // "post processing" (dates, times, alarm, recurrence)
897
898 // other half of 1169 fixlet without getting into regression
899 // if rp.days == 0 and rp.type == Event::Weekly
900 if ( rp.type == Event::Weekly && rp.days == 0 )
901 rp.days = Event::day( e.start().date().dayOfWeek() );
902
903
894 // start date/time 904 // start date/time
895 e.setRepeat( rp.type != Event::NoRepeat, rp ); 905 e.setRepeat( rp.type != Event::NoRepeat, rp );
896 906