0003-Upgrade-ObjC-syntax.patch 3.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394
  1. From baeb9d2044195cd6ce202d96a37c45a9ebf20101 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
  3. Date: Sun, 28 Apr 2013 17:34:36 +0200
  4. Subject: [PATCH 3/3] Upgrade ObjC syntax
  5. ---
  6. OBSlider/OBSlider.m | 30 +++++++++++++-----------------
  7. 1 file changed, 13 insertions(+), 17 deletions(-)
  8. diff --git a/OBSlider/OBSlider.m b/OBSlider/OBSlider.m
  9. index 1dcf4bc..6b8a2c3 100644
  10. --- a/OBSlider/OBSlider.m
  11. +++ b/OBSlider/OBSlider.m
  12. @@ -37,7 +37,7 @@
  13. {
  14. self.scrubbingSpeeds = [self defaultScrubbingSpeeds];
  15. self.scrubbingSpeedChangePositions = [self defaultScrubbingSpeedChangePositions];
  16. - self.scrubbingSpeed = [[self.scrubbingSpeeds objectAtIndex:0] floatValue];
  17. + self.scrubbingSpeed = [(self.scrubbingSpeeds)[0] floatValue];
  18. }
  19. return self;
  20. }
  21. @@ -64,7 +64,7 @@
  22. self.scrubbingSpeedChangePositions = [self defaultScrubbingSpeedChangePositions];
  23. }
  24. - self.scrubbingSpeed = [[self.scrubbingSpeeds objectAtIndex:0] floatValue];
  25. + self.scrubbingSpeed = [(self.scrubbingSpeeds)[0] floatValue];
  26. }
  27. return self;
  28. }
  29. @@ -94,7 +94,7 @@
  30. - (NSUInteger) findIndexOfLowerScrubbingSpeed:(NSArray*)scrubbingSpeedPositions :(CGFloat)verticalOffset {
  31. for (int i=0; i < [scrubbingSpeedPositions count]; i++) {
  32. - NSNumber *obj = [scrubbingSpeedPositions objectAtIndex:i];
  33. + NSNumber *obj = scrubbingSpeedPositions[i];
  34. if (verticalOffset < [obj floatValue]) {
  35. return i;
  36. }
  37. @@ -117,7 +117,7 @@
  38. if (scrubbingSpeedChangePosIndex == NSNotFound) {
  39. scrubbingSpeedChangePosIndex = [self.scrubbingSpeeds count];
  40. }
  41. - self.scrubbingSpeed = [[self.scrubbingSpeeds objectAtIndex:scrubbingSpeedChangePosIndex - 1] floatValue];
  42. + self.scrubbingSpeed = [(self.scrubbingSpeeds)[scrubbingSpeedChangePosIndex - 1] floatValue];
  43. CGRect trackRect = [self trackRectForBounds:self.bounds];
  44. realPositionValue = realPositionValue + (self.maximumValue - self.minimumValue) * (trackingOffset / trackRect.size.width);
  45. @@ -142,7 +142,7 @@
  46. {
  47. if (self.tracking)
  48. {
  49. - self.scrubbingSpeed = [[self.scrubbingSpeeds objectAtIndex:0] floatValue];
  50. + self.scrubbingSpeed = [(self.scrubbingSpeeds)[0] floatValue];
  51. [self sendActionsForControlEvents:UIControlEventValueChanged];
  52. }
  53. }
  54. @@ -155,23 +155,19 @@
  55. // Used in -initWithFrame: and -initWithCoder:
  56. - (NSArray *) defaultScrubbingSpeeds
  57. {
  58. - return [NSArray arrayWithObjects:
  59. - [NSNumber numberWithFloat:1.0f],
  60. - [NSNumber numberWithFloat:0.5f],
  61. - [NSNumber numberWithFloat:0.25f],
  62. - [NSNumber numberWithFloat:0.1f],
  63. - nil];
  64. + return @[@1.0f,
  65. + @0.5f,
  66. + @0.25f,
  67. + @0.1f];
  68. }
  69. - (NSArray *) defaultScrubbingSpeedChangePositions
  70. {
  71. - return [NSArray arrayWithObjects:
  72. - [NSNumber numberWithFloat:0.0f],
  73. - [NSNumber numberWithFloat:50.0f],
  74. - [NSNumber numberWithFloat:100.0f],
  75. - [NSNumber numberWithFloat:150.0f],
  76. - nil];
  77. + return @[@0.0f,
  78. + @50.0f,
  79. + @100.0f,
  80. + @150.0f];
  81. }
  82. @end
  83. --
  84. 1.7.12.4 (Apple Git-37)