update for 6.1 final

mattneub · Nov 1, 2014 · c2c7408 · c2c7408
1 parent 16c59fc
commit c2c7408
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/bk2ch22p780shake/ch35p1037shake/ViewController.swift b/bk2ch22p780shake/ch35p1037shake/ViewController.swift
@@ -15,7 +15,7 @@ class ViewController: UIViewController {
         self.becomeFirstResponder()
     }
 
-    override func motionEnded(motion: UIEventSubtype, withEvent event: UIEvent!) {
+    override func motionEnded(motion: UIEventSubtype, withEvent event: UIEvent) {
         if self.isFirstResponder() {
             println("hey, you shook me!")
         } else {

diff --git a/bk2ch22p782lyingDown/ch25p1039lyingDown/ViewController.swift b/bk2ch22p782lyingDown/ch25p1039lyingDown/ViewController.swift
@@ -39,7 +39,7 @@ class ViewController: UIViewController {
             self.timer = NSTimer.scheduledTimerWithTimeInterval(self.motman.accelerometerUpdateInterval, target: self, selector: "pollAccel:", userInfo: nil, repeats: true)
         case 2:
             self.motman.startAccelerometerUpdatesToQueue(NSOperationQueue.mainQueue(), withHandler: {
-                (accelerometerData:CMAccelerometerData!, error:NSError!) -> Void in
+                (accelerometerData:CMAccelerometerData!, error:NSError!) in
                 if error != nil {
                     println(error)
                     self.stopAccelerometer()
@@ -64,8 +64,8 @@ class ViewController: UIViewController {
         self.oldZ = accel.z * alpha + self.oldZ * (1.0 - alpha)
     }
 
-    func receiveAccel (acc:CMAccelerometerData) {
-        self.addAcceleration(acc.acceleration)
+    func receiveAccel (dat:CMAccelerometerData) {
+        self.addAcceleration(dat.acceleration)
         let x = self.oldX
         let y = self.oldY
         let z = self.oldZ