From a559f9bf6e66967abc952568820452f80e954aa3 Mon Sep 17 00:00:00 2001 From: Matthias Neeracher Date: Wed, 18 Feb 2015 15:12:02 +0100 Subject: [PATCH] standardizedURL should have been URLByStandardizingPath --- AVRsack/ASBuilder.swift | 2 +- AVRsack/ASFileTree.swift | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AVRsack/ASBuilder.swift b/AVRsack/ASBuilder.swift index 7fb05d7..526a0f1 100644 --- a/AVRsack/ASBuilder.swift +++ b/AVRsack/ASBuilder.swift @@ -35,7 +35,7 @@ class ASBuilder { } func setProjectURL(url: NSURL) { - dir = url.URLByDeletingLastPathComponent!.standardizedURL! + dir = url.URLByDeletingLastPathComponent!.URLByStandardizingPath! } func stop() { diff --git a/AVRsack/ASFileTree.swift b/AVRsack/ASFileTree.swift index 3702d66..7750c96 100644 --- a/AVRsack/ASFileTree.swift +++ b/AVRsack/ASFileTree.swift @@ -166,9 +166,9 @@ class ASFileItem : ASFileNode { init(_ prop: NSDictionary, withRootURL rootURL: NSURL) { type = ASFileType(rawValue: prop[kKindKey] as! String)! if let relativeURL = NSURL(string: prop[kPathKey] as! String, relativeToURL: rootURL) { - url = relativeURL.standardizedURL! + url = relativeURL.URLByStandardizingPath! } else { - url = NSURL(fileURLWithPath:(prop[kPathKey] as! String))!.standardizedURL! + url = NSURL(fileURLWithPath:(prop[kPathKey] as! String))!.URLByStandardizingPath! } } override func nodeName() -> String { @@ -223,7 +223,7 @@ class ASFileTree : NSObject, NSOutlineViewDataSource { } func setProjectURL(url: NSURL) { root.name = url.lastPathComponent!.stringByDeletingPathExtension - dir = url.URLByDeletingLastPathComponent!.standardizedURL! + dir = url.URLByDeletingLastPathComponent!.URLByStandardizingPath! } func apply(closure: (ASFileNode) -> ()) { root.apply(closure)