Amended code to remove ++, -- and C-style for loops following their deprecation in Swift.

Hudzilla · Hudzilla · commit 9fbca1f66f25 · 2016-02-01T14:23:44.000Z
diff --git a/project11/Project11/GameScene.swift b/project11/Project11/GameScene.swift
@@ -147,10 +147,10 @@ class GameScene: SKScene, SKPhysicsContactDelegate {
 	func collisionBetweenBall(ball: SKNode, object: SKNode) {
 		if object.name == "good" {
 			destroyBall(ball)
-			++score
+			score += 1
 		} else if object.name == "bad" {
 			destroyBall(ball)
-			--score
+			score -= 1
 		}
 	}
 
diff --git a/project14/Project14/GameScene.swift b/project14/Project14/GameScene.swift
@@ -77,7 +77,7 @@ class GameScene: SKScene {
 					whackSlot.charNode.yScale = 0.85
 
 					whackSlot.hit()
-					++score
+					score += 1
 
 					runAction(SKAction.playSoundFileNamed("whack.caf", waitForCompletion:false))
 				}
@@ -90,7 +90,7 @@ class GameScene: SKScene {
     }
 
 	func createEnemy() {
-		++numRounds
+		numRounds += 1
 
 		if numRounds >= 30 {
 			for slot in slots {
diff --git a/project15/Project15/ViewController.swift b/project15/Project15/ViewController.swift
@@ -67,7 +67,7 @@ class ViewController: UIViewController {
 				self.tap.hidden = false
 		}
 
-		++currentAnimation
+		currentAnimation += 1
 
 		if currentAnimation > 7 {
 			currentAnimation = 0
diff --git a/project17/Project17/GameScene.swift b/project17/Project17/GameScene.swift
@@ -171,7 +171,7 @@ class GameScene: SKScene {
 				node.runAction(seq)
 
 				// 6
-				++score
+				score += 1
 
 				// 7
 				let index = activeEnemies.indexOf(node as! SKSpriteNode)!
@@ -232,7 +232,7 @@ class GameScene: SKScene {
 		let path = UIBezierPath()
 		path.moveToPoint(activeSlicePoints[0])
 
-		for var i = 1; i < activeSlicePoints.count; ++i {
+		for i in 1 ..< activeSlicePoints.count {
 			path.addLineToPoint(activeSlicePoints[i])
 		}
 
@@ -246,7 +246,7 @@ class GameScene: SKScene {
 
 		for node in activeEnemies {
 			if node.name == "bombContainer" {
-				++bombCount
+				bombCount += 1
 				break
 			}
 		}
@@ -435,13 +435,13 @@ class GameScene: SKScene {
 		}
 
 
-		++sequencePosition
+		sequencePosition += 1
 
 		nextSequenceQueued = false
 	}
 
 	func subtractLife() {
-		--lives
+		lives -= 1
 
 		runAction(SKAction.playSoundFileNamed("wrong.caf", waitForCompletion: false))
 
diff --git a/project2/Project2/ViewController.swift b/project2/Project2/ViewController.swift
@@ -50,10 +50,10 @@ class ViewController: UIViewController {
 
 		if sender.tag == correctAnswer {
 			title = "Correct"
-			++score
+			score += 1
 		} else {
 			title = "Wrong"
-			--score
+			score -= 1
 		}
 
 		let ac = UIAlertController(title: title, message: "Your score is \(score).", preferredStyle: .Alert)
diff --git a/project20/Project20/GameScene.swift b/project20/Project20/GameScene.swift
@@ -30,16 +30,14 @@ class GameScene: SKScene {
 		background.zPosition = -1
 		addChild(background)
 
-//		gameTimer = NSTimer.scheduledTimerWithTimeInterval(6, target: self, selector: "launchFireworks", userInfo: nil, repeats: true)
+		gameTimer = NSTimer.scheduledTimerWithTimeInterval(6, target: self, selector: "launchFireworks", userInfo: nil, repeats: true)
 	}
    
 	override func update(currentTime: NSTimeInterval) {
-		for var i = fireworks.count - 1; i >= 0; --i {
-			let firework = fireworks[i]
-
+		for (index, firework) in fireworks.enumerate().reverse() {
 			if firework.position.y > 900 {
 				// this uses a position high above so that rockets can explode off screen
-				fireworks.removeAtIndex(i)
+				fireworks.removeAtIndex(index)
 				firework.removeFromParent()
 			}
 		}
@@ -181,16 +179,15 @@ class GameScene: SKScene {
 	func explodeFireworks() {
 		var numExploded = 0
 
-		for var i = fireworks.count - 1; i >= 0; --i {
-			let parent = fireworks[i]
-			let firework = parent.children[0] as! SKSpriteNode
+		for (index, fireworkGroup) in fireworks.enumerate().reverse() {
+			let firework = fireworkGroup.children[0] as! SKSpriteNode
 
 			if firework.name == "selected" {
 				// destroy this firework!
-				explodeFirework(parent)
-				fireworks.removeAtIndex(i)
+				explodeFirework(fireworkGroup)
+				fireworks.removeAtIndex(index)
 
-				++numExploded
+				numExploded += 1
 			}
 		}
 
diff --git a/project26/Project26/GameScene.swift b/project26/Project26/GameScene.swift
@@ -180,7 +180,7 @@ class GameScene: SKScene, SKPhysicsContactDelegate {
 		if node.name == "vortex" {
 			player.physicsBody!.dynamic = false
 			gameOver = true
-			--score
+			score -= 1
 
 			let move = SKAction.moveTo(node.position, duration: 0.25)
 			let scale = SKAction.scaleTo(0.0001, duration: 0.25)
@@ -193,7 +193,7 @@ class GameScene: SKScene, SKPhysicsContactDelegate {
 			}
 		} else if node.name == "star" {
 			node.removeFromParent()
-			++score
+			score += 1
 		} else if node.name == "finish" {
 			// next level?
 		}
diff --git a/project27/Project27/ViewController.swift b/project27/Project27/ViewController.swift
@@ -26,7 +26,7 @@ class ViewController: UIViewController {
 	}
 
 	@IBAction func redrawTapped(sender: AnyObject) {
-		++currentDrawType
+		currentDrawType += 1
 
 		if currentDrawType > 5 {
 			currentDrawType = 0
diff --git a/project30-files/Project30/ImageViewController.swift b/project30-files/Project30/ImageViewController.swift
@@ -64,7 +64,7 @@ class ImageViewController: UIViewController {
 	override func touchesBegan(touches: Set<UITouch>, withEvent event: UIEvent?) {
 		let defaults = NSUserDefaults.standardUserDefaults()
 		var currentVal = defaults.integerForKey(image) ?? 0
-		++currentVal
+		currentVal += 1
 
 		defaults.setInteger(currentVal, forKey:image)
 
diff --git a/project32/Project32/MasterViewController.swift b/project32/Project32/MasterViewController.swift
@@ -19,7 +19,7 @@ class MasterViewController: UITableViewController {
 		super.viewDidLoad()
 
 		projects.append(["Project 1: Storm Viewer", "Constants and variables, UITableView, UIImageView, NSFileManager, storyboards"])
-		projects.append(["Project 2: Guess the Flag", "@2x and @3x images, asset catalogs, integers, doubles, floats, operators (+=, ++, and --), UIButton, enums, CALayer, UIColor, random numbers, actions, string interpolation, UIAlertController"])
+		projects.append(["Project 2: Guess the Flag", "@2x and @3x images, asset catalogs, integers, doubles, floats, operators (+= and -=), UIButton, enums, CALayer, UIColor, random numbers, actions, string interpolation, UIAlertController"])
 		projects.append(["Project 3: Social Media", "UIBarButtonItem, UIActivityViewController, the Social framework, NSURL"])
 		projects.append(["Project 4: Easy Browser", "loadView(), WKWebView, delegation, classes and structs, NSURLRequest, UIToolbar, UIProgressView., key-value observing"])
 		projects.append(["Project 5: Word Scramble", "NSString, closures, method return values, booleans, NSRange"])
diff --git a/project34/Project34/Board.swift b/project34/Project34/Board.swift
@@ -65,8 +65,8 @@ class Board: NSObject, GKGameModel {
 	}
 
 	func nextEmptySlotInColumn(column: Int) -> Int? {
-		for var row = 0; row < Board.height; row++ {
-			if chipInColumn(column, row:row) == .None {
+		for row in 0 ..< Board.height {
+			if chipInColumn(column, row: row) == .None {
 				return row
 			}
 		}
@@ -85,7 +85,7 @@ class Board: NSObject, GKGameModel {
 	}
 
 	func isFull() -> Bool {
-		for var column = 0; column < Board.width; column++ {
+		for column in 0 ..< Board.width {
 			if canMoveInColumn(column) {
 				return false
 			}
@@ -97,8 +97,8 @@ class Board: NSObject, GKGameModel {
 	func isWinForPlayer(player: GKGameModelPlayer) -> Bool {
 		let chip = (player as! Player).chip
 
-		for var row = 0; row < Board.height; row++ {
-			for var col = 0; col < Board.width; col++ {
+		for row in 0 ..< Board.height {
+			for col in 0 ..< Board.width {
 				if squaresMatchChip(chip, row: row, col: col, moveX: 1, moveY: 0) {
 					return true
 				} else if squaresMatchChip(chip, row: row, col: col, moveX: 0, moveY: 1) {
@@ -139,7 +139,7 @@ class Board: NSObject, GKGameModel {
 			var moves = [Move]()
 
 			// 4
-			for var column = 0; column < Board.width; column++ {
+			for column in 0 ..< Board.width {
 				if canMoveInColumn(column) {
 					// 5
 					moves.append(Move(column: column))
diff --git a/project34/Project34/ViewController.swift b/project34/Project34/ViewController.swift
@@ -20,7 +20,7 @@ class ViewController: UIViewController {
 	override func viewDidLoad() {
 		super.viewDidLoad()
 
-		for var column = 0; column < Board.width; column++ {
+		for _ in 0 ..< Board.width {
 			placedChips.append([UIView]())
 		}
 
diff --git a/project36/Project36/GameScene.swift b/project36/Project36/GameScene.swift
@@ -265,7 +265,7 @@ class GameScene: SKScene, SKPhysicsContactDelegate {
 			let sound = SKAction.playSoundFileNamed("coin.wav", waitForCompletion: false)
 			runAction(sound)
 
-			++score
+			score += 1
 
 			return
 		}
diff --git a/project6a/Project2/ViewController.swift b/project6a/Project2/ViewController.swift
@@ -50,10 +50,10 @@ class ViewController: UIViewController {
 
 		if sender.tag == correctAnswer {
 			title = "Correct"
-			++score
+			score += 1
 		} else {
 			title = "Wrong"
-			--score
+			score -= 1
 		}
 
 		let ac = UIAlertController(title: title, message: "Your score is \(score).", preferredStyle: .Alert)
diff --git a/project8/Project8/ViewController.swift b/project8/Project8/ViewController.swift
@@ -88,7 +88,7 @@ class ViewController: UIViewController {
 			answersLabel.text = splitClues.joinWithSeparator("\n")
 
 			currentAnswer.text = ""
-			++score
+			score += 1
 
 			if score % 7 == 0 {
 				let ac = UIAlertController(title: "Well done!", message: "Are you ready for the next level?", preferredStyle: .Alert)
@@ -116,7 +116,7 @@ class ViewController: UIViewController {
 	}
 
 	func levelUp(action: UIAlertAction!) {
-		++level
+		level += 1
 		solutions.removeAll(keepCapacity: true)
 
 		loadLevel()

Original file line number	Diff line number	Diff line change
`@@ -147,10 +147,10 @@ class GameScene: SKScene, SKPhysicsContactDelegate {`
`147`	`147`	`func collisionBetweenBall(ball: SKNode, object: SKNode) {`
`148`	`148`	`if object.name == "good" {`
`149`	`149`	`destroyBall(ball)`
`150`		`- ++score`
	`150`	`+ score += 1`
`151`	`151`	`} else if object.name == "bad" {`
`152`	`152`	`destroyBall(ball)`
`153`		`- --score`
	`153`	`+ score -= 1`
`154`	`154`	`}`
`155`	`155`	`}`
`156`	`156`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ class GameScene: SKScene {`
`77`	`77`	`whackSlot.charNode.yScale = 0.85`
`78`	`78`
`79`	`79`	`whackSlot.hit()`
`80`		`- ++score`
	`80`	`+ score += 1`
`81`	`81`
`82`	`82`	`runAction(SKAction.playSoundFileNamed("whack.caf", waitForCompletion:false))`
`83`	`83`	`}`
`@@ -90,7 +90,7 @@ class GameScene: SKScene {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`func createEnemy() {`
`93`		`- ++numRounds`
	`93`	`+ numRounds += 1`
`94`	`94`
`95`	`95`	`if numRounds >= 30 {`
`96`	`96`	`for slot in slots {`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ class ViewController: UIViewController {`
`67`	`67`	`self.tap.hidden = false`
`68`	`68`	`}`
`69`	`69`
`70`		`- ++currentAnimation`
	`70`	`+ currentAnimation += 1`
`71`	`71`
`72`	`72`	`if currentAnimation > 7 {`
`73`	`73`	`currentAnimation = 0`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ class GameScene: SKScene {`
`171`	`171`	`node.runAction(seq)`
`172`	`172`
`173`	`173`	`// 6`
`174`		`- ++score`
	`174`	`+ score += 1`
`175`	`175`
`176`	`176`	`// 7`
`177`	`177`	`let index = activeEnemies.indexOf(node as! SKSpriteNode)!`
`@@ -232,7 +232,7 @@ class GameScene: SKScene {`
`232`	`232`	`let path = UIBezierPath()`
`233`	`233`	`path.moveToPoint(activeSlicePoints[0])`
`234`	`234`
`235`		`- for var i = 1; i < activeSlicePoints.count; ++i {`
	`235`	`+ for i in 1 ..< activeSlicePoints.count {`
`236`	`236`	`path.addLineToPoint(activeSlicePoints[i])`
`237`	`237`	`}`
`238`	`238`
`@@ -246,7 +246,7 @@ class GameScene: SKScene {`
`246`	`246`
`247`	`247`	`for node in activeEnemies {`
`248`	`248`	`if node.name == "bombContainer" {`
`249`		`- ++bombCount`
	`249`	`+ bombCount += 1`
`250`	`250`	`break`
`251`	`251`	`}`
`252`	`252`	`}`
`@@ -435,13 +435,13 @@ class GameScene: SKScene {`
`435`	`435`	`}`
`436`	`436`
`437`	`437`
`438`		`- ++sequencePosition`
	`438`	`+ sequencePosition += 1`
`439`	`439`
`440`	`440`	`nextSequenceQueued = false`
`441`	`441`	`}`
`442`	`442`
`443`	`443`	`func subtractLife() {`
`444`		`- --lives`
	`444`	`+ lives -= 1`
`445`	`445`
`446`	`446`	`runAction(SKAction.playSoundFileNamed("wrong.caf", waitForCompletion: false))`
`447`	`447`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class ViewController: UIViewController {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`@IBAction func redrawTapped(sender: AnyObject) {`
`29`		`- ++currentDrawType`
	`29`	`+ currentDrawType += 1`
`30`	`30`
`31`	`31`	`if currentDrawType > 5 {`
`32`	`32`	`currentDrawType = 0`