author | zautrix <zautrix> | 2004-10-15 14:26:07 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-15 14:26:07 (UTC) |
commit | 4f276d80bd977401d656851515474cc00c661e5b (patch) (side-by-side diff) | |
tree | 0d3a747bef0431ef791b69876f5bda554f9ca83f /libkcal/vcalformat.cpp | |
parent | c2fb960297c4b08980921c818a4d347057732390 (diff) | |
download | kdepimpi-4f276d80bd977401d656851515474cc00c661e5b.zip kdepimpi-4f276d80bd977401d656851515474cc00c661e5b.tar.gz kdepimpi-4f276d80bd977401d656851515474cc00c661e5b.tar.bz2 |
many phone and sync fixes
-rw-r--r-- | libkcal/vcalformat.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp index a6ae1bc..df93209 100644 --- a/libkcal/vcalformat.cpp +++ b/libkcal/vcalformat.cpp @@ -62,6 +62,7 @@ bool VCalFormat::load(Calendar *calendar, const QString &fileName) { mCalendar = calendar; clearException(); + if ( ! useLocalTime ) useLocalTime = mCalendar->isLocalTime(); VObject *vcal = 0; @@ -90,6 +91,7 @@ bool VCalFormat::load(Calendar *calendar, const QString &fileName) bool VCalFormat::save(Calendar *calendar, const QString &fileName) { mCalendar = calendar; + if ( ! useLocalTime ) useLocalTime = mCalendar->isLocalTime(); QString tmpStr; @@ -1172,6 +1174,8 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) /*********************** YEARLY-BY-MONTH *******************************/ else if (tmpStr.left(2) == "YM") { + // we have to set this such that recurrence accepts addYearlyNum(tmpDay); + anEvent->recurrence()->setYearly(Recurrence::rYearlyMonth, 1, -1); int index = tmpStr.find(' '); int last = tmpStr.findRev(' ') + 1; int rFreq = tmpStr.mid(2, (index-1)).toInt(); @@ -1206,6 +1210,8 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) /*********************** YEARLY-BY-DAY *********************************/ else if (tmpStr.left(2) == "YD") { + // we have to set this such that recurrence accepts addYearlyNum(tmpDay); + anEvent->recurrence()->setYearly(Recurrence::rYearlyDay, 1, -1); int index = tmpStr.find(' '); int last = tmpStr.findRev(' ') + 1; int rFreq = tmpStr.mid(2, (index-1)).toInt(); @@ -1536,11 +1542,12 @@ void VCalFormat::populate(VObject *vcal) // set the time zone if ((curVO = isAPropertyOf(vcal, VCTimeZoneProp)) != 0) { + if ( vObjectUStringZValue(curVO) != 0 ) { char *s = fakeCString(vObjectUStringZValue(curVO)); mCalendar->setTimeZone(s); deleteStr(s); } - + } // Store all events with a relatedTo property in a list for post-processing mEventsRelate.clear(); |