Monotone-Parent: 6e7ac4cd1529c1ca1209faeb43583ee333facec8
Monotone-Revision: ede91a980338742748957c740a70ce61e1bcccae Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-03-22T20:55:43 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
59e376fea5
commit
430c2261f8
|
@ -1,3 +1,10 @@
|
|||
2011-03-22 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* iCalByDayMask.m (-occursOnDay:withWeekOccurrence:): fixed method
|
||||
to return true only when it is valid to do so...
|
||||
(-weekDayOccurrences): new method that returns a reference to the
|
||||
days ivar.
|
||||
|
||||
2011-03-20 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* CardGroup.m (-removeChild:, -removeChildren:): new
|
||||
|
|
|
@ -67,6 +67,8 @@ typedef iCalWeekOccurrence iCalWeekOccurrences[7];
|
|||
- (iCalWeekDay) firstDay;
|
||||
- (int) firstOccurrence;
|
||||
|
||||
- (iCalWeekOccurrences *) weekDayOccurrences;
|
||||
|
||||
- (NSString *) asRuleString;
|
||||
- (NSString *) asRuleStringWithIntegers;
|
||||
|
||||
|
|
|
@ -207,7 +207,7 @@
|
|||
- (BOOL) occursOnDay: (iCalWeekDay) weekDay
|
||||
withWeekOccurrence: (iCalWeekOccurrence) occurrence
|
||||
{
|
||||
return (days[weekDay] | occurrence) > 0;
|
||||
return (days[weekDay] & occurrence) > 0;
|
||||
}
|
||||
|
||||
- (BOOL) occursOnDay: (iCalWeekDay) weekDay
|
||||
|
@ -244,13 +244,10 @@
|
|||
iCalWeekDay day;
|
||||
|
||||
day = -1;
|
||||
for (i = 0; i < 7; i++)
|
||||
for (i = 0; day == -1 && i < 7; i++)
|
||||
{
|
||||
if (days[i])
|
||||
{
|
||||
day = i;
|
||||
break;
|
||||
}
|
||||
day = i;
|
||||
}
|
||||
|
||||
return day;
|
||||
|
@ -270,6 +267,11 @@
|
|||
return occurrence;
|
||||
}
|
||||
|
||||
- (iCalWeekOccurrences *) weekDayOccurrences
|
||||
{
|
||||
return &days;
|
||||
}
|
||||
|
||||
- (int) _iCalWeekOccurrenceIntValue: (iCalWeekOccurrence) weekOccurrence
|
||||
{
|
||||
int i = 0;
|
||||
|
|
Loading…
Reference in New Issue