3-group-ios/GBA002
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated to Swift 2 syntax

Browse Source
This commit is contained in:
Riley Testut 2015-06-30 01:15:10 -07:00
parent f615b65f5e
commit 8084536551
6 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cores/DeltaCore

@ -1 +1 @@
Subproject commit cb3e98f268e615aac3906572fa001ada5e99eadc Subproject commit 92a390d01eaafbce5852531d8e072ae29752dedb

5
Delta.xcodeproj/project.pbxproj
View File

@ -172,7 +172,7 @@
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastSwiftUpdateCheck = 0700; LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 0630; LastUpgradeCheck = 0700;
ORGANIZATIONNAME = "Riley Testut"; ORGANIZATIONNAME = "Riley Testut";
TargetAttributes = { TargetAttributes = {
BFFA71D61AAC406100EE9DD1 = { BFFA71D61AAC406100EE9DD1 = {
@ -267,6 +267,7 @@
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99; GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
@ -339,6 +340,7 @@
INFOPLIST_FILE = Delta/Info.plist; INFOPLIST_FILE = Delta/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.rileytestut.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Debug; name = Debug;
@ -354,6 +356,7 @@
INFOPLIST_FILE = Delta/Info.plist; INFOPLIST_FILE = Delta/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.rileytestut.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Release; name = Release;

13
Delta/DirectoryContentsDataSource.swift
View File

@ -87,16 +87,13 @@ private extension DirectoryContentsDataSource
{ {
func didUpdateDirectoryContents() func didUpdateDirectoryContents()
{ {
var error: NSError? = nil do
var contents = NSFileManager.defaultManager().contentsOfDirectoryAtURL(self.directoryURL, includingPropertiesForKeys: nil, options:NSDirectoryEnumerationOptions.SkipsSubdirectoryDescendants | NSDirectoryEnumerationOptions.SkipsHiddenFiles, error: &error) as! [NSURL]?
if let contents = contents
{ {
self.directoryContents = contents self.directoryContents = try NSFileManager.defaultManager().contentsOfDirectoryAtURL(self.directoryURL, includingPropertiesForKeys: nil, options:[NSDirectoryEnumerationOptions.SkipsSubdirectoryDescendants, NSDirectoryEnumerationOptions.SkipsHiddenFiles])
} }
else catch let error as NSError
{ {
println(error?.userInfo) print("\(error) \(error.userInfo)")
} }
self.contentsUpdateHandler?() self.contentsUpdateHandler?()
@ -112,7 +109,7 @@ extension DirectoryContentsDataSource: UITableViewDataSource
public func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell public func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell
{ {
let tableViewCell = tableView.dequeueReusableCellWithIdentifier(self.tableViewCellIdentifier, forIndexPath: indexPath) as! UITableViewCell let tableViewCell = tableView.dequeueReusableCellWithIdentifier(self.tableViewCellIdentifier, forIndexPath: indexPath) as UITableViewCell
self.cellConfigurationBlock?(tableViewCell, indexPath, self.URLAtIndexPath(indexPath)) self.cellConfigurationBlock?(tableViewCell, indexPath, self.URLAtIndexPath(indexPath))

2
Delta/EmulationViewController.swift
View File

@ -41,7 +41,7 @@ class EmulationViewController: UIViewController
self.controllerView.controllerSkin = controllerSkin self.controllerView.controllerSkin = controllerSkin
println(self.controllerView.intrinsicContentSize()) print(self.controllerView.intrinsicContentSize())
} }
override func viewDidAppear(animated: Bool) override func viewDidAppear(animated: Bool)

20
Delta/GamesViewController.swift
View File

@ -15,20 +15,28 @@ class GamesViewController: UITableViewController
override init(style: UITableViewStyle) override init(style: UITableViewStyle)
{ {
let error: NSError? = nil; if let documentsDirectoryURL = NSFileManager.defaultManager().URLsForDirectory(NSSearchPathDirectory.DocumentDirectory, inDomains: NSSearchPathDomainMask.UserDomainMask).first
let documentsDirectoryURL = NSFileManager.defaultManager().URLsForDirectory(NSSearchPathDirectory.DocumentDirectory, inDomains: NSSearchPathDomainMask.UserDomainMask).first as! NSURL {
self.directoryContentsDataSource = DirectoryContentsDataSource(directoryURL: documentsDirectoryURL) self.directoryContentsDataSource = DirectoryContentsDataSource(directoryURL: documentsDirectoryURL)
}
else
{
self.directoryContentsDataSource = nil
}
super.init(style: style) super.init(style: style)
} }
required init(coder aDecoder: NSCoder) required init(coder aDecoder: NSCoder)
{ {
let error: NSError? = nil; if let documentsDirectoryURL = NSFileManager.defaultManager().URLsForDirectory(NSSearchPathDirectory.DocumentDirectory, inDomains: NSSearchPathDomainMask.UserDomainMask).first
let documentsDirectoryURL = NSFileManager.defaultManager().URLsForDirectory(NSSearchPathDirectory.DocumentDirectory, inDomains: NSSearchPathDomainMask.UserDomainMask).first as! NSURL {
self.directoryContentsDataSource = DirectoryContentsDataSource(directoryURL: documentsDirectoryURL) self.directoryContentsDataSource = DirectoryContentsDataSource(directoryURL: documentsDirectoryURL)
}
else
{
self.directoryContentsDataSource = nil
}
super.init(coder: aDecoder) super.init(coder: aDecoder)
} }

2
External/Roxas vendored

@ -1 +1 @@
Subproject commit f58b2ea50683f13d20f486486b41307267ddd7ac Subproject commit 43b0ef22a303ac87d54fd89069b372be77fb4bc5