From d1d0a8737c7479e0a26527e9ecc27cf8224a1204 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 28 Jan 2008 15:32:14 +0000 Subject: [PATCH] Monotone-Parent: 79bb558b5af161878cb37bfe44c1dacae8c3a146 Monotone-Revision: 50638763e49bc1757ecbfcb595c2bf8e94368094 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-01-28T15:32:14 Monotone-Branch: ca.inverse.sogo --- SOPE/NGCards/ChangeLog | 6 ++++++ SOPE/NGCards/iCalDailyRecurrenceCalculator.m | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog index fbac587b8..b66b3e49d 100644 --- a/SOPE/NGCards/ChangeLog +++ b/SOPE/NGCards/ChangeLog @@ -1,3 +1,9 @@ +2008-01-28 Wolfgang Sourdeau + + * iCalDailyRecurrenceCalculator.m ([iCalDailyRecurrenceCalculator + -recurrenceRangesWithinCalendarDateRange:]): make use of << + instead of exp2 to compute the mask. + 2008-01-22 Wolfgang Sourdeau * iCalRecurrenceRule.m ([iCalRecurrenceRule -repeatInterval]): diff --git a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m index 7c7d2656c..6c9fd423b 100644 --- a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m @@ -23,18 +23,16 @@ #import #import +#import + +#import "NSCalendarDate+ICal.h" #import "iCalRecurrenceCalculator.h" +#import "iCalRecurrenceRule.h" @interface iCalDailyRecurrenceCalculator : iCalRecurrenceCalculator @end -#import -#import "iCalRecurrenceRule.h" -#import "NSCalendarDate+ICal.h" - -#include - @interface iCalRecurrenceCalculator(PrivateAPI) - (NSCalendarDate *)lastInstanceStartDate; @end @@ -105,7 +103,9 @@ // FIXME: Should we also check the end date? We might want // to check if the end date is also within it. if ([self->rrule byDayMask]) { - mask = [start dayOfWeek] == 0 ? iCalWeekDaySunday : (unsigned int)exp2([start dayOfWeek]-1); + mask = ([start dayOfWeek] + ? (unsigned int) 1 << ([start dayOfWeek] - 1) + : iCalWeekDaySunday); if (([self->rrule byDayMask]&mask) != mask) continue; }