Updated to Swift 2.

erikdoe · Oct 3, 2015 · a46478f · a46478f
1 parent 94a9167
commit a46478f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/Examples/SwiftExamples/SwiftExamples.xcodeproj/project.pbxproj b/Examples/SwiftExamples/SwiftExamples.xcodeproj/project.pbxproj
@@ -187,6 +187,8 @@
 		03151B221948E756009A27B8 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastSwiftMigration = 0700;
+				LastSwiftUpdateCheck = 0700;
 				LastUpgradeCheck = 0600;
 				ORGANIZATIONNAME = "Mulle Kybernetik";
 				TargetAttributes = {

diff --git a/Examples/SwiftExamples/SwiftExamples/Controller.swift b/Examples/SwiftExamples/SwiftExamples/Controller.swift
@@ -8,16 +8,15 @@
 
 import Foundation
 
-@objc
+class Controller: NSObject {
-class Controller {
     var connection: Connection;
     var data: String;
 
     class func newController() -> Controller {
         return Controller()
     }
 
-    init() {
+    override init() {
         self.connection = ServerConnection();
         self.data = "";
     }

diff --git a/Examples/SwiftExamples/SwiftExamples/MasterViewController.swift b/Examples/SwiftExamples/SwiftExamples/MasterViewController.swift
@@ -41,9 +41,9 @@ class MasterViewController: UITableViewController {
 
     override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
         if segue.identifier == "showDetail" {
-            if let indexPath = self.tableView.indexPathForSelectedRow() {
+            if let indexPath = self.tableView.indexPathForSelectedRow {
-                let object = objects[indexPath.row] as NSDate
+                let object = objects[indexPath.row] as! NSDate
-                (segue.destinationViewController as DetailViewController).detailItem = object
+                (segue.destinationViewController as! DetailViewController).detailItem = object
             }
         }
     }
@@ -61,7 +61,7 @@ class MasterViewController: UITableViewController {
     override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCellWithIdentifier("Cell", forIndexPath: indexPath) as UITableViewCell
 
-        let object = objects[indexPath.row] as NSDate
+        let object = objects[indexPath.row] as! NSDate
         cell.textLabel!.text = object.description
         return cell
     }