Differences From Artifact [14c8339812]:
- File src/OFTimer.m — part of check-in [13967106a5] at 2017-04-02 00:43:46 on branch trunk — OFTimer: Add "repeating" property (user: js, size: 10524) [annotate] [blame] [check-ins using]
To Artifact [abb68d10aa]:
- File
src/OFTimer.m
— part of check-in
[4af49a13c3]
at
2017-05-07 20:10:13
on branch trunk
— Small code style change
Casts are now written like types in variable declarations. (user: js, size: 10532) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
208 209 210 211 212 213 214 | #endif - init { OF_INVALID_INIT_METHOD } | | | 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 | #endif - init { OF_INVALID_INIT_METHOD } - (instancetype)OF_initWithFireDate: (OFDate *)fireDate interval: (of_time_interval_t)interval target: (id)target selector: (SEL)selector object: (id)object1 object: (id)object2 arguments: (uint8_t)arguments repeats: (bool)repeats |
︙ | ︙ | |||
240 241 242 243 244 245 246 | [self release]; @throw e; } return self; } | | | | | | 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 | [self release]; @throw e; } return self; } - initWithFireDate: (OFDate *)fireDate interval: (of_time_interval_t)interval target: (id)target selector: (SEL)selector repeats: (bool)repeats { return [self OF_initWithFireDate: fireDate interval: interval target: target selector: selector object: nil object: nil arguments: 0 repeats: repeats]; } - initWithFireDate: (OFDate *)fireDate interval: (of_time_interval_t)interval target: (id)target selector: (SEL)selector object: (id)object repeats: (bool)repeats { return [self OF_initWithFireDate: fireDate interval: interval target: target selector: selector object: object object: nil arguments: 1 repeats: repeats]; } - initWithFireDate: (OFDate *)fireDate interval: (of_time_interval_t)interval target: (id)target selector: (SEL)selector object: (id)object1 object: (id)object2 repeats: (bool)repeats { return [self OF_initWithFireDate: fireDate interval: interval target: target selector: selector object: object1 object: object2 arguments: 2 repeats: repeats]; } #ifdef OF_HAVE_BLOCKS - initWithFireDate: (OFDate *)fireDate interval: (of_time_interval_t)interval repeats: (bool)repeats block: (of_timer_block_t)block { self = [super init]; @try { |
︙ | ︙ | |||
346 347 348 349 350 351 352 | - (of_comparison_result_t)compare: (id <OFComparing>)object { OFTimer *timer; if (![object isKindOfClass: [OFTimer class]]) @throw [OFInvalidArgumentException exception]; | | | 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 | - (of_comparison_result_t)compare: (id <OFComparing>)object { OFTimer *timer; if (![object isKindOfClass: [OFTimer class]]) @throw [OFInvalidArgumentException exception]; timer = (OFTimer *)object; return [_fireDate compare: timer->_fireDate]; } - (void)fire { void *pool = objc_autoreleasePoolPush(); |
︙ | ︙ | |||
406 407 408 409 410 411 412 | [_condition unlock]; } #endif objc_autoreleasePoolPop(pool); } | | | | 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 | [_condition unlock]; } #endif objc_autoreleasePoolPop(pool); } - (OFDate *)fireDate { return [[_fireDate copy] autorelease]; } - (void)setFireDate: (OFDate *)fireDate { [self retain]; @try { @synchronized (self) { OFDate *old; [_inRunLoop OF_removeTimer: self]; |
︙ | ︙ |