| author | waspe <waspe> | 2003-11-04 16:59:55 (UTC) |
|---|---|---|
| committer | waspe <waspe> | 2003-11-04 16:59:55 (UTC) |
| commit | 5865ec3970cead5b2cf3dd255a55cf2e1869e330 (patch) (unidiff) | |
| tree | 657cab0ca04a93565ee16e79f0aedda63d1923d0 /library/datebookdb.cpp | |
| parent | da5c9b06fe0081050ab8165cf3d189dbc8117bf6 (diff) | |
| download | opie-5865ec3970cead5b2cf3dd255a55cf2e1869e330.zip opie-5865ec3970cead5b2cf3dd255a55cf2e1869e330.tar.gz opie-5865ec3970cead5b2cf3dd255a55cf2e1869e330.tar.bz2 | |
resloved merge conflict
| -rw-r--r-- | library/datebookdb.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/library/datebookdb.cpp b/library/datebookdb.cpp index 000ff71..188d8e1 100644 --- a/library/datebookdb.cpp +++ b/library/datebookdb.cpp | |||
| @@ -97,2 +97,4 @@ bool nextOccurance(const Event &e, const QDate &from, QDateTime &next) | |||
| 97 | 97 | ||
| 98 | |||
| 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 */ |
| @@ -101,2 +103,3 @@ bool nextOccurance(const Event &e, const QDate &from, QDateTime &next) | |||
| 101 | 103 | ||
| 104 | |||
| 102 | dayOfWeek = dayOfWeek % 7; /* the actual day of week */ | 105 | dayOfWeek = dayOfWeek % 7; /* the actual day of week */ |
| @@ -893,2 +896,9 @@ void DateBookDB::loadFile( const QString &strFile ) | |||
| 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 |