diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
| commit | cc29364f06178f8f6b457384f2ec37a042bd9d43 (patch) | |
| tree | 7c77a3184c698bbf9d98cef09fb1ba8124daceba /kalarm/alarmevent.cpp | |
| parent | 4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff) | |
| download | tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip | |
* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch
* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kalarm/alarmevent.cpp')
| -rw-r--r-- | kalarm/alarmevent.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kalarm/alarmevent.cpp b/kalarm/alarmevent.cpp index 8aa898922..34ce46a29 100644 --- a/kalarm/alarmevent.cpp +++ b/kalarm/alarmevent.cpp @@ -2427,7 +2427,7 @@ KARecurrence::Type KAEvent::checkRecur() const KARecurrence::Type type = mRecurrence->type(); switch (type) { - case KARecurrence::MINUTELY: // hourly + case KARecurrence::MINUTELY: // hourly case KARecurrence::DAILY: // daily case KARecurrence::WEEKLY: // weekly on multiple days of week case KARecurrence::MONTHLY_DAY: // monthly on multiple dates in month @@ -2776,7 +2776,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju if (types.count() > 0) alarm->setCustomProperty(APPNAME, TYPE_PROPERTY, types.join(",")); - if (pre_0_7 && alarm->repeatCount() > 0 && alarm->snoozeTime() > 0) + if (pre_0_7 && alarm->repeatCount() > 0 && alarm->snoozeTime().value() > 0) { // It's a KAlarm pre-0.7 calendar file. // Minutely recurrences were stored differently. @@ -3028,7 +3028,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju } } } - + if (pre_1_5_0) { /* @@ -3087,7 +3087,7 @@ bool KAEvent::convertRepetition(KCal::Event* event) for (Alarm::List::ConstIterator alit = alarms.begin(); alit != alarms.end(); ++alit) { Alarm* alarm = *alit; - if (alarm->repeatCount() > 0 && alarm->snoozeTime() > 0) + if (alarm->repeatCount() > 0 && alarm->snoozeTime().value() > 0) { if (!converted) { |