Changeset 51 for trunk/Cocoa/Pester/Source/PSAlarms.m
- Timestamp:
- 11/18/02 08:57:41 (21 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Cocoa/Pester/Source/PSAlarms.m
r28 r51 46 46 nextAlarm = nil; 47 47 // sort alarms so earliest is first 48 [alarms sortUsingSelector: @selector(compare :)];48 [alarms sortUsingSelector: @selector(compareDate:)]; 49 49 // find first un-expired alarm 50 50 e = [alarms objectEnumerator]; … … 126 126 } 127 127 128 - (NSArray *)alarms; 129 { 130 return alarms; 131 } 132 128 133 - (int)alarmCount; 129 134 { … … 138 143 - (void)removeAlarmAtIndex:(int)index; 139 144 { 140 [(PSAlarm *)[alarms objectAtIndex: index] cancel ];145 [(PSAlarm *)[alarms objectAtIndex: index] cancelTimer]; 141 146 [alarms removeObjectAtIndex: index]; 142 147 } … … 151 156 while ( (n = [e nextObject]) != nil) { 152 157 alarmIndex = [n intValue]; 153 [(PSAlarm *)[alarms objectAtIndex: alarmIndex] cancel ];158 [(PSAlarm *)[alarms objectAtIndex: alarmIndex] cancelTimer]; 154 159 indexArray[i] = alarmIndex; 155 160 i++; 156 161 } 157 162 [alarms removeObjectsFromIndices: indexArray numIndices: indexCount]; 163 free(indexArray); indexArray = NULL; 158 164 [self _changed]; 159 165 NS_HANDLER … … 164 170 } 165 171 172 - (void)removeAlarms:(NSSet *)alarmsToRemove; 173 { 174 NSEnumerator *e = [alarms objectEnumerator]; 175 PSAlarm *alarm; 176 NSMutableArray *indices = [NSMutableArray arrayWithCapacity: [alarmsToRemove count]]; 177 int alarmIndex = 0; 178 179 while ( (alarm = [e nextObject]) != nil) { 180 if ([alarmsToRemove containsObject: alarm]) 181 [indices addObject: [NSNumber numberWithInt: alarmIndex]]; 182 alarmIndex++; 183 } 184 [self removeAlarmsAtIndices: indices]; 185 } 186 166 187 @end
Note:
See TracChangeset
for help on using the changeset viewer.