remove a bunch of parameter exclamation marks I think are wrong (mostly in CALayer)

mattneub · mattneub · commit 03ed90ea4e3b · 2014-10-17T17:31:38.000-07:00
diff --git a/bk2ch01p039conditionalConstraints/bk2ch01p039/Main.storyboard b/bk2ch01p039conditionalConstraints/bk2ch01p039/Main.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6249" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="VVW-Se-F96">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="VVW-Se-F96">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6243"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
     </dependencies>
     <scenes>
diff --git a/bk2ch01p041designableView/bk2ch01p040sizeClasses/Base.lproj/Main.storyboard b/bk2ch01p041designableView/bk2ch01p040sizeClasses/Base.lproj/Main.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="BYZ-38-t0r">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
diff --git a/bk2ch01p045constraintsOrderOfEvents/ch14p398constraintsOrderOfEvents/MyView.swift b/bk2ch01p045constraintsOrderOfEvents/ch14p398constraintsOrderOfEvents/MyView.swift
@@ -32,7 +32,7 @@ class MyView: UIView, Printable {
     }
     
     // gets an extra cycle, I've no idea why
-    override func layoutSublayersOfLayer(layer: CALayer!) {
+    override func layoutSublayersOfLayer(layer: CALayer) {
         super.layoutSublayersOfLayer(layer)
         println("\(self)\n\(__FUNCTION__)\n")
     }
diff --git a/bk2ch01p046transformsAndConstraints/ch14p400transformsAndConstraints/LoggingView.swift b/bk2ch01p046transformsAndConstraints/ch14p400transformsAndConstraints/LoggingView.swift
@@ -9,7 +9,7 @@ class LoggingView: UIView {
         println("\(self) \(__FUNCTION__)\n")
     }
     
-    override func layoutSublayersOfLayer(layer: CALayer!) {
+    override func layoutSublayersOfLayer(layer: CALayer) {
         super.layoutSublayersOfLayer(layer)
         println("\(self) \(__FUNCTION__)\n")
     }
diff --git a/bk2ch02p059sixBlueCircles/ch15p411sixBlueCircles/Views.swift b/bk2ch02p059sixBlueCircles/ch15p411sixBlueCircles/Views.swift
@@ -18,7 +18,7 @@ class MyView2 : UIView {
 }
 class MyView3 : UIView {
     override func drawRect(rect: CGRect) {}
-    override func drawLayer(layer: CALayer!, inContext con: CGContext!) {
+    override func drawLayer(layer: CALayer, inContext con: CGContext) {
         UIGraphicsPushContext(con)
         let p = UIBezierPath(ovalInRect: CGRectMake(0,0,100,100))
         UIColor.blueColor().setFill()
@@ -28,7 +28,7 @@ class MyView3 : UIView {
 }
 class MyView4 : UIView {
     override func drawRect(rect: CGRect) {}
-    override func drawLayer(layer: CALayer!, inContext con: CGContext!) {
+    override func drawLayer(layer: CALayer, inContext con: CGContext) {
         CGContextAddEllipseInRect(con, CGRectMake(0,0,100,100))
         CGContextSetFillColorWithColor(con, UIColor.blueColor().CGColor)
         CGContextFillPath(con)
diff --git a/bk2ch03p101drawingIntoLayer/ch16p450drawingIntoLayer/Smilers.swift b/bk2ch03p101drawingIntoLayer/ch16p450drawingIntoLayer/Smilers.swift
@@ -4,7 +4,7 @@ import UIKit
 
 
 class Smiler:NSObject {
-    override func drawLayer(layer: CALayer!, inContext ctx: CGContext!) {
+    override func drawLayer(layer: CALayer, inContext ctx: CGContext) {
         UIGraphicsPushContext(ctx)
         //[[UIImage imageNamed: @"smiley"] drawInRect:CGContextGetClipBoundingBox(ctx)];
         UIImage(named:"smiley")!.drawAtPoint(CGPoint())
@@ -15,15 +15,15 @@ class Smiler:NSObject {
 }
 
 class Smiler2:NSObject {
-    override func displayLayer(layer: CALayer!) {
+    override func displayLayer(layer: CALayer) {
         layer.contents = UIImage(named:"smiley")!.CGImage
         println("\(__FUNCTION__)")
         println(layer.contentsGravity)
     }
 }
 
 class SmilerLayer:CALayer {
-    override func drawInContext(ctx: CGContext!) {
+    override func drawInContext(ctx: CGContext) {
         UIGraphicsPushContext(ctx)
         //[[UIImage imageNamed: @"smiley"] drawInRect:CGContextGetClipBoundingBox(ctx)];
         UIImage(named:"smiley")!.drawAtPoint(CGPoint())
diff --git a/bk2ch03p108compass/ch16p457compass/CompassView.swift b/bk2ch03p108compass/ch16p457compass/CompassView.swift
@@ -104,7 +104,7 @@ class CompassLayer : CALayer {
 
     }
     
-    override func drawLayer(layer: CALayer!, inContext con: CGContext!) {
+    override func drawLayer(layer: CALayer, inContext con: CGContext) {
         println("drawLayer:inContext: for arrow")
         
         // Questa poi la conosco pur troppo!
diff --git a/bk2ch03p112layerDepth/ch16p457compass/CompassView.swift b/bk2ch03p112layerDepth/ch16p457compass/CompassView.swift
@@ -123,7 +123,7 @@ class CompassLayer : CALayer {
 
     }
     
-    override func drawLayer(layer: CALayer!, inContext con: CGContext!) {
+    override func drawLayer(layer: CALayer, inContext con: CGContext) {
         println("drawLayer:inContext: for arrow")
         
         // Questa poi la conosco pur troppo!
diff --git a/bk2ch03p114transformLayer2/ch16p457compass/CompassView.swift b/bk2ch03p114transformLayer2/ch16p457compass/CompassView.swift
@@ -149,7 +149,7 @@ class CompassLayer : CALayer {
 
     }
     
-    override func drawLayer(layer: CALayer!, inContext con: CGContext!) {
+    override func drawLayer(layer: CALayer, inContext con: CGContext) {
         println("drawLayer:inContext: for arrow")
         
         // Questa poi la conosco pur troppo!
diff --git a/bk2ch04p148layerAnimation/ch17p490layerAnimation/CompassView.swift b/bk2ch04p148layerAnimation/ch17p490layerAnimation/CompassView.swift
@@ -91,7 +91,7 @@ class CompassLayer : CALayer {
 
     }
     
-    override func drawLayer(layer: CALayer!, inContext con: CGContext!) {
+    override func drawLayer(layer: CALayer, inContext con: CGContext) {
         println("drawLayer:inContext: for arrow")
         
         // Questa poi la conosco pur troppo!
diff --git a/bk2ch04p151customAnimatableProperty/ch17p498customAnimatableProperty/MyViewAndLayer.swift b/bk2ch04p151customAnimatableProperty/ch17p498customAnimatableProperty/MyViewAndLayer.swift
@@ -14,14 +14,14 @@ class MyLayer : CALayer {
     
     var thickness : CGFloat = 0
     
-    override class func needsDisplayForKey(key: String!) -> Bool {
+    override class func needsDisplayForKey(key: String) -> Bool {
         if key == "thickness" {
             return true
         }
         return super.needsDisplayForKey(key)
     }
     
-    override func drawInContext(con: CGContext!) {
+    override func drawInContext(con: CGContext) {
         let r = self.bounds.rectByInsetting(dx:20, dy:20)
         CGContextSetFillColorWithColor(con, UIColor.redColor().CGColor)
         CGContextFillRect(con, r)
diff --git a/bk2ch04p165customAnimatableProperty2/ch17p498customAnimatableProperty/MyViewAndLayer.swift b/bk2ch04p165customAnimatableProperty2/ch17p498customAnimatableProperty/MyViewAndLayer.swift
@@ -24,7 +24,7 @@ public extension MyLayer {
         return super.needsDisplayForKey(key)
     }
     
-    override func drawInContext(con: CGContext!) {
+    override func drawInContext(con: CGContext) {
         let r = self.bounds.rectByInsetting(dx:20, dy:20)
         CGContextSetFillColorWithColor(con, UIColor.redColor().CGColor)
         CGContextFillRect(con, r)
diff --git a/bk2ch04p177dynamics2/Dynamics/MyDropBounceAndRollBehavior.swift b/bk2ch04p177dynamics2/Dynamics/MyDropBounceAndRollBehavior.swift
@@ -10,6 +10,8 @@ class MyDropBounceAndRollBehavior : UIDynamicBehavior, UICollisionBehaviorDelega
         super.init()
     }
     
+    // exclamation mark instead of question mark is deliberate so I don't have to keep unwrapping!
+    
     override func willMoveToAnimator(anim: UIDynamicAnimator!) {
         if anim == nil { return }
         
diff --git a/bk2ch04p177dynamics2/Dynamics/ViewController.swift b/bk2ch04p177dynamics2/Dynamics/ViewController.swift
@@ -26,11 +26,11 @@ class ViewController : UIViewController, UIDynamicAnimatorDelegate {
         self.anim.addBehavior(MyDropBounceAndRollBehavior(view:self.iv))
     }
     
-    func dynamicAnimatorDidPause(animator: UIDynamicAnimator!) {
+    func dynamicAnimatorDidPause(animator: UIDynamicAnimator) {
         println("pause")
     }
     
-    func dynamicAnimatorWillResume(animator: UIDynamicAnimator!) {
+    func dynamicAnimatorWillResume(animator: UIDynamicAnimator) {
         println("resume")
     }
 
diff --git a/bk2ch05p203gestureRecognizers/ch18p541gestureRecognizers/HorizVertPanGestureRecognizers.swift b/bk2ch05p203gestureRecognizers/ch18p541gestureRecognizers/HorizVertPanGestureRecognizers.swift
@@ -6,12 +6,12 @@ import UIKit
 class HorizPanGestureRecognizer : UIPanGestureRecognizer {
     var origLoc : CGPoint!
     
-    override func touchesBegan(touches: NSSet!, withEvent event: UIEvent!) {
+    override func touchesBegan(touches: NSSet, withEvent event: UIEvent) {
         self.origLoc = (touches.anyObject() as UITouch).locationInView(self.view!.superview)
         super.touchesBegan(touches, withEvent:event)
     }
     
-    override func touchesMoved(touches: NSSet!, withEvent event: UIEvent!) {
+    override func touchesMoved(touches: NSSet, withEvent event: UIEvent) {
         if self.state == .Possible {
             let loc = (touches.anyObject() as UITouch).locationInView(self.view!.superview)
             let deltaX = fabs(loc.x - self.origLoc.x)
@@ -34,12 +34,12 @@ class HorizPanGestureRecognizer : UIPanGestureRecognizer {
 class VertPanGestureRecognizer : UIPanGestureRecognizer {
     var origLoc : CGPoint!
     
-    override func touchesBegan(touches: NSSet!, withEvent event: UIEvent!) {
+    override func touchesBegan(touches: NSSet, withEvent event: UIEvent) {
         self.origLoc = (touches.anyObject() as UITouch).locationInView(self.view!.superview)
         super.touchesBegan(touches, withEvent:event)
     }
     
-    override func touchesMoved(touches: NSSet!, withEvent event: UIEvent!) {
+    override func touchesMoved(touches: NSSet, withEvent event: UIEvent) {
         if self.state == .Possible {
             let loc = (touches.anyObject() as UITouch).locationInView(self.view!.superview)
             let deltaX = fabs(loc.x - self.origLoc.x)
diff --git a/bk2ch05p211compassTappable/ch17p490layerAnimation/CompassView.swift b/bk2ch05p211compassTappable/ch17p490layerAnimation/CompassView.swift
@@ -40,7 +40,7 @@ class CompassLayer : CALayer {
         }
     }
     
-    override func hitTest(p: CGPoint) -> CALayer! {
+    override func hitTest(p: CGPoint) -> CALayer? {
         var lay = super.hitTest(p)
         if lay == self.arrow {
             // artificially restrict touchability to roughly the shaft/point area
@@ -122,7 +122,7 @@ class CompassLayer : CALayer {
 
     }
     
-    override func drawLayer(layer: CALayer!, inContext con: CGContext!) {
+    override func drawLayer(layer: CALayer, inContext con: CGContext) {
         println("drawLayer:inContext: for arrow")
         
         // Questa poi la conosco pur troppo!

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class MyView: UIView, Printable {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`// gets an extra cycle, I've no idea why`
`35`		`- override func layoutSublayersOfLayer(layer: CALayer!) {`
	`35`	`+ override func layoutSublayersOfLayer(layer: CALayer) {`
`36`	`36`	`super.layoutSublayersOfLayer(layer)`
`37`	`37`	`println("\(self)\n\(__FUNCTION__)\n")`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class LoggingView: UIView {`
`9`	`9`	`println("\(self) \(__FUNCTION__)\n")`
`10`	`10`	`}`
`11`	`11`
`12`		`- override func layoutSublayersOfLayer(layer: CALayer!) {`
	`12`	`+ override func layoutSublayersOfLayer(layer: CALayer) {`
`13`	`13`	`super.layoutSublayersOfLayer(layer)`
`14`	`14`	`println("\(self) \(__FUNCTION__)\n")`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ class CompassLayer : CALayer {`
`104`	`104`
`105`	`105`	`}`
`106`	`106`
`107`		`- override func drawLayer(layer: CALayer!, inContext con: CGContext!) {`
	`107`	`+ override func drawLayer(layer: CALayer, inContext con: CGContext) {`
`108`	`108`	`println("drawLayer:inContext: for arrow")`
`109`	`109`
`110`	`110`	`// Questa poi la conosco pur troppo!`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ class CompassLayer : CALayer {`
`123`	`123`
`124`	`124`	`}`
`125`	`125`
`126`		`- override func drawLayer(layer: CALayer!, inContext con: CGContext!) {`
	`126`	`+ override func drawLayer(layer: CALayer, inContext con: CGContext) {`
`127`	`127`	`println("drawLayer:inContext: for arrow")`
`128`	`128`
`129`	`129`	`// Questa poi la conosco pur troppo!`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ class CompassLayer : CALayer {`
`149`	`149`
`150`	`150`	`}`
`151`	`151`
`152`		`- override func drawLayer(layer: CALayer!, inContext con: CGContext!) {`
	`152`	`+ override func drawLayer(layer: CALayer, inContext con: CGContext) {`
`153`	`153`	`println("drawLayer:inContext: for arrow")`
`154`	`154`
`155`	`155`	`// Questa poi la conosco pur troppo!`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ class CompassLayer : CALayer {`
`91`	`91`
`92`	`92`	`}`
`93`	`93`
`94`		`- override func drawLayer(layer: CALayer!, inContext con: CGContext!) {`
	`94`	`+ override func drawLayer(layer: CALayer, inContext con: CGContext) {`
`95`	`95`	`println("drawLayer:inContext: for arrow")`
`96`	`96`
`97`	`97`	`// Questa poi la conosco pur troppo!`
Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,14 @@ class MyLayer : CALayer {`
`14`	`14`
`15`	`15`	`var thickness : CGFloat = 0`
`16`	`16`
`17`		`- override class func needsDisplayForKey(key: String!) -> Bool {`
	`17`	`+ override class func needsDisplayForKey(key: String) -> Bool {`
`18`	`18`	`if key == "thickness" {`
`19`	`19`	`return true`
`20`	`20`	`}`
`21`	`21`	`return super.needsDisplayForKey(key)`
`22`	`22`	`}`
`23`	`23`
`24`		`- override func drawInContext(con: CGContext!) {`
	`24`	`+ override func drawInContext(con: CGContext) {`
`25`	`25`	`let r = self.bounds.rectByInsetting(dx:20, dy:20)`
`26`	`26`	`CGContextSetFillColorWithColor(con, UIColor.redColor().CGColor)`
`27`	`27`	`CGContextFillRect(con, r)`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public extension MyLayer {`
`24`	`24`	`return super.needsDisplayForKey(key)`
`25`	`25`	`}`
`26`	`26`
`27`		`- override func drawInContext(con: CGContext!) {`
	`27`	`+ override func drawInContext(con: CGContext) {`
`28`	`28`	`let r = self.bounds.rectByInsetting(dx:20, dy:20)`
`29`	`29`	`CGContextSetFillColorWithColor(con, UIColor.redColor().CGColor)`
`30`	`30`	`CGContextFillRect(con, r)`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ class MyDropBounceAndRollBehavior : UIDynamicBehavior, UICollisionBehaviorDelega`
`10`	`10`	`super.init()`
`11`	`11`	`}`
`12`	`12`
	`13`	`+ // exclamation mark instead of question mark is deliberate so I don't have to keep unwrapping!`
	`14`	`+`
`13`	`15`	`override func willMoveToAnimator(anim: UIDynamicAnimator!) {`
`14`	`16`	`if anim == nil { return }`
`15`	`17`
Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,11 @@ class ViewController : UIViewController, UIDynamicAnimatorDelegate {`
`26`	`26`	`self.anim.addBehavior(MyDropBounceAndRollBehavior(view:self.iv))`
`27`	`27`	`}`
`28`	`28`
`29`		`- func dynamicAnimatorDidPause(animator: UIDynamicAnimator!) {`
	`29`	`+ func dynamicAnimatorDidPause(animator: UIDynamicAnimator) {`
`30`	`30`	`println("pause")`
`31`	`31`	`}`
`32`	`32`
`33`		`- func dynamicAnimatorWillResume(animator: UIDynamicAnimator!) {`
	`33`	`+ func dynamicAnimatorWillResume(animator: UIDynamicAnimator) {`
`34`	`34`	`println("resume")`
`35`	`35`	`}`
`36`	`36`