summaryrefslogtreecommitdiff
path: root/library
authorwaspe <waspe>2003-11-04 16:59:55 (UTC)
committer waspe <waspe>2003-11-04 16:59:55 (UTC)
commit5865ec3970cead5b2cf3dd255a55cf2e1869e330 (patch) (side-by-side diff)
tree657cab0ca04a93565ee16e79f0aedda63d1923d0 /library
parentda5c9b06fe0081050ab8165cf3d189dbc8117bf6 (diff)
downloadopie-5865ec3970cead5b2cf3dd255a55cf2e1869e330.zip
opie-5865ec3970cead5b2cf3dd255a55cf2e1869e330.tar.gz
opie-5865ec3970cead5b2cf3dd255a55cf2e1869e330.tar.bz2
resloved merge conflict
Diffstat (limited to 'library') (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
@@ -94,9 +94,12 @@ bool nextOccurance(const Event &e, const QDate &from, QDateTime &next)
// firstOfWeek = 0; this is already done at decl.
while(!((1 << firstOfWeek) & e.repeatPattern().days))
- firstOfWeek++;
+ firstOfWeek++;
+
+
/* there is at least one 'day', or there would be no event */
while(!((1 << (dayOfWeek % 7)) & e.repeatPattern().days))
- dayOfWeek++;
+ dayOfWeek++;
+
dayOfWeek = dayOfWeek % 7; /* the actual day of week */
@@ -892,4 +895,11 @@ void DateBookDB::loadFile( const QString &strFile )
}
// "post processing" (dates, times, alarm, recurrence)
+
+ // other half of 1169 fixlet without getting into regression
+ // if rp.days == 0 and rp.type == Event::Weekly
+ if ( rp.type == Event::Weekly && rp.days == 0 )
+ rp.days = Event::day( e.start().date().dayOfWeek() );
+
+
// start date/time
e.setRepeat( rp.type != Event::NoRepeat, rp );