microtherion/AVRSack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix deprecated calls

Browse Source
This commit is contained in:
Matthias Neeracher 2015-04-04 23:43:47 +02:00 committed by Matthias Neeracher
parent c549c2aae2
commit 28f64bb631
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AVRsack/ASFileTree.swift
View File

@ -85,6 +85,7 @@ private let kNameKey = "Name"
return ASFileItem(prop, withRootURL:rootURL) return ASFileItem(prop, withRootURL:rootURL)
default: default:
assertionFailure("Undefined item type in file hierarchy") assertionFailure("Undefined item type in file hierarchy")
abort()
} }
} }
func paths(rootPath: String) -> [String] { func paths(rootPath: String) -> [String] {

5
AVRsack/ASProjDoc.swift
View File

@ -155,7 +155,7 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
kProgrammerKey: programmer, kProgrammerKey: programmer,
kPortKey: port kPortKey: port
] ]
return NSPropertyListSerialization.dataFromPropertyList(data, format: .XMLFormat_v1_0, errorDescription: nil) return NSPropertyListSerialization.dataWithPropertyList(data, format:.XMLFormat_v1_0, options:0, error:nil)
} }
func updateProjectURL() { func updateProjectURL() {
@ -198,7 +198,8 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
return false return false
} }
updateProjectURL() updateProjectURL()
let projectData : NSDictionary = NSPropertyListSerialization.propertyListFromData(data, mutabilityOption: .Immutable, format: nil, errorDescription: nil) as! NSDictionary let projectData =
NSPropertyListSerialization.propertyListWithData(data, options:0, format:nil, error:nil) as! NSDictionary
let projectVersion = projectData[kVersionKey] as! Double let projectVersion = projectData[kVersionKey] as! Double
assert(projectVersion <= floor(kCurVersion+1.0), "Project version too new for this app") assert(projectVersion <= floor(kCurVersion+1.0), "Project version too new for this app")
if let themeName = projectData[kThemeKey] as? String { if let themeName = projectData[kThemeKey] as? String {