Monotone-Parent: 79bb558b5af161878cb37bfe44c1dacae8c3a146
Monotone-Revision: 50638763e49bc1757ecbfcb595c2bf8e94368094 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-01-28T15:32:14 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
0ec8642a25
commit
d1d0a8737c
|
@ -1,3 +1,9 @@
|
|||
2008-01-28 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* iCalDailyRecurrenceCalculator.m ([iCalDailyRecurrenceCalculator
|
||||
-recurrenceRangesWithinCalendarDateRange:]): make use of <<
|
||||
instead of exp2 to compute the mask.
|
||||
|
||||
2008-01-22 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* iCalRecurrenceRule.m ([iCalRecurrenceRule -repeatInterval]):
|
||||
|
|
|
@ -23,18 +23,16 @@
|
|||
#import <Foundation/NSArray.h>
|
||||
|
||||
#import <NGExtensions/NSCalendarDate+misc.h>
|
||||
#import <NGExtensions/NGCalendarDateRange.h>
|
||||
|
||||
#import "NSCalendarDate+ICal.h"
|
||||
|
||||
#import "iCalRecurrenceCalculator.h"
|
||||
#import "iCalRecurrenceRule.h"
|
||||
|
||||
@interface iCalDailyRecurrenceCalculator : iCalRecurrenceCalculator
|
||||
@end
|
||||
|
||||
#import <NGExtensions/NGCalendarDateRange.h>
|
||||
#import "iCalRecurrenceRule.h"
|
||||
#import "NSCalendarDate+ICal.h"
|
||||
|
||||
#include <math.h>
|
||||
|
||||
@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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue