Merge pull request #1 from tp/xcode-6.3beta

Fix to work with latest Xcode / Swift
frosty · Mar 12, 2015 · 8f1e63a · 8f1e63a
2 parents 1f16e99 + 54041dc
commit 8f1e63a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/Flipbook WatchKit Extension/InterfaceController.swift b/Flipbook WatchKit Extension/InterfaceController.swift
@@ -15,14 +15,6 @@ class InterfaceController: WKInterfaceController {
     @IBOutlet weak var arcImage: WKInterfaceImage!
     @IBOutlet weak var activityImage: WKInterfaceImage!
 
-    override init(context: AnyObject?) {
-        // Initialize variables here.
-        super.init(context: context)
-
-        // Configure interface objects here.
-        NSLog("%@ init", self)
-    }
-
     override func willActivate() {
         // This method is called when watch view controller is about to be visible to user
         super.willActivate()

diff --git a/Flipbook.swift b/Flipbook.swift
@@ -61,7 +61,7 @@ class Flipbook: NSObject {
 
     private func newImagePath() -> String? {
         if let documentsDirectory = documentsDirectory() {
-            let imagePath = documentsDirectory.stringByAppendingPathComponent(NSString(format: "%@-%d@2x.png", imagePrefix, imageCounter++))
+            let imagePath = documentsDirectory.stringByAppendingPathComponent(String(format: "%@-%d@2x.png", imagePrefix, imageCounter++))
             return imagePath
         }