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

Manually fixes errors Swift 3 migrator missed

Browse Source 
Thank God I won’t have to ever do this again…hopefully…
This commit is contained in:
Riley Testut 2016-09-20 23:37:52 -07:00
parent 53bf0313b4
commit 12ca37e0f4
16 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Common/Components/LoadImageOperation.swift
View File

@ -28,7 +28,7 @@ public class LoadImageOperation: RSTOperation
public var imageCache: NSCache<NSURL, UIImage>? { public var imageCache: NSCache<NSURL, UIImage>? {
didSet { didSet {
// Ensures if an image is cached, it will be returned immediately, to prevent temporary flash of placeholder image // Ensures if an image is cached, it will be returned immediately, to prevent temporary flash of placeholder image
self.isImmediate = self.imageCache?.object(forKey: self.URL) != nil self.isImmediate = self.imageCache?.object(forKey: self.URL as NSURL) != nil
} }
} }
@ -48,7 +48,7 @@ public extension LoadImageOperation
{ {
guard !self.isCancelled else { return } guard !self.isCancelled else { return }
if let cachedImage = self.imageCache?.object(forKey: self.URL) if let cachedImage = self.imageCache?.object(forKey: self.URL as NSURL)
{ {
self.image = cachedImage self.image = cachedImage
return return
@ -65,7 +65,7 @@ public extension LoadImageOperation
loadedImage.draw(at: CGPoint.zero) loadedImage.draw(at: CGPoint.zero)
UIGraphicsEndImageContext() UIGraphicsEndImageContext()
self.imageCache?.setObject(loadedImage, forKey: self.URL) self.imageCache?.setObject(loadedImage, forKey: self.URL as NSURL)
self.image = loadedImage self.image = loadedImage
} }

2
Common/Database/DatabaseManager.swift
View File

@ -49,7 +49,7 @@ extension DatabaseManager
let filename = identifier + "." + url.pathExtension let filename = identifier + "." + url.pathExtension
let game = Game.insertIntoManagedObjectContext(context) let game = Game.insertIntoManagedObjectContext(context)
game.name = url.deletingPathExtension().lastPathComponent ?? NSLocalizedString("Game", comment: "") game.name = url.deletingPathExtension().lastPathComponent
game.identifier = identifier game.identifier = identifier
game.filename = filename game.filename = filename

6
Common/Importing/GamePickerController.swift
View File

@ -31,9 +31,9 @@ class GamePickerController: NSObject
{ {
var delegate: GamePickerControllerDelegate? var delegate: GamePickerControllerDelegate?
private weak var presentingViewController: UIViewController? fileprivate weak var presentingViewController: UIViewController?
private func presentGamePickerControllerFromPresentingViewController(_ presentingViewController: UIViewController, animated: Bool, completion: ((Void) -> Void)?) fileprivate func presentGamePickerControllerFromPresentingViewController(_ presentingViewController: UIViewController, animated: Bool, completion: ((Void) -> Void)?)
{ {
self.presentingViewController = presentingViewController self.presentingViewController = presentingViewController
@ -84,7 +84,7 @@ class GamePickerController: NSObject
self.presentingViewController?.present(alertController, animated: true, completion: completion) self.presentingViewController?.present(alertController, animated: true, completion: completion)
} }
private func importGamesAtURLs(_ URLs: [URL]) fileprivate func importGamesAtURLs(_ URLs: [URL])
{ {
DatabaseManager.shared.importGames(at: URLs) { identifiers in DatabaseManager.shared.importGames(at: URLs) { identifiers in

2
Cores/DeltaCore

@ -1 +1 @@
Subproject commit e02022d8d3d04624e10e5394319e7994265f2999 Subproject commit f2d78459b5cc37039f72427dbdcfedde00947690

2
Cores/GBADeltaCore

@ -1 +1 @@
Subproject commit 0a568b49c332df8b09aa6ea03f06e9e612d27d8f Subproject commit 29b9929d45d906590a332c0c32f377466485727d

2
Cores/SNESDeltaCore

@ -1 +1 @@
Subproject commit 98c58263eb9513df5c1cfc10ac8834474fbc9958 Subproject commit fc4c0f0a4623ce9b561227c3d842647a716d32b9

14
Delta/Emulation/GameViewController.swift
View File

@ -50,7 +50,7 @@ class GameViewController: DeltaCore.GameViewController
} }
//MARK: - Private Properties - //MARK: - Private Properties -
private var pauseViewController: PauseViewController? fileprivate var pauseViewController: PauseViewController?
fileprivate var pausingGameController: GameController? fileprivate var pausingGameController: GameController?
// Prevents the same save state from being saved multiple times // Prevents the same save state from being saved multiple times
@ -71,12 +71,12 @@ class GameViewController: DeltaCore.GameViewController
} }
} }
private var context = CIContext(options: [kCIContextWorkingColorSpace: NSNull()]) fileprivate var context = CIContext(options: [kCIContextWorkingColorSpace: NSNull()])
// Sustain Buttons // Sustain Buttons
private var updateSemaphores = Set<DispatchSemaphore>() fileprivate var updateSemaphores = Set<DispatchSemaphore>()
private var sustainedInputs = [ObjectIdentifier: [Input]]() fileprivate var sustainedInputs = [ObjectIdentifier: [Input]]()
private var reactivateSustainedInputsQueue: OperationQueue fileprivate var reactivateSustainedInputsQueue: OperationQueue
fileprivate var selectingSustainedButtons = false fileprivate var selectingSustainedButtons = false
fileprivate var sustainButtonsContentView: UIView! fileprivate var sustainButtonsContentView: UIView!
@ -192,7 +192,7 @@ extension GameViewController
// MARK: - Segues // MARK: - Segues
/// KVO /// KVO
override func prepare(for segue: UIStoryboardSegue, sender: AnyObject?) override func prepare(for segue: UIStoryboardSegue, sender: Any?)
{ {
guard let identifier = segue.identifier else { return } guard let identifier = segue.identifier else { return }
@ -312,7 +312,7 @@ extension GameViewController
// MARK: - KVO // MARK: - KVO
/// KVO /// KVO
override func observeValue(forKeyPath keyPath: String?, of object: AnyObject?, change: [NSKeyValueChangeKey : AnyObject]?, context: UnsafeMutablePointer<Void>?) override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?)
{ {
guard context == &kvoContext else { return super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context) } guard context == &kvoContext else { return super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context) }

2
Delta/Emulation/PreviewGameViewController.swift
View File

@ -101,7 +101,7 @@ extension PreviewGameViewController
// Dispose of any resources that can be recreated. // Dispose of any resources that can be recreated.
} }
override func observeValue(forKeyPath keyPath: String?, of object: AnyObject?, change: [NSKeyValueChangeKey : AnyObject]?, context: UnsafeMutableRawPointer?) override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?)
{ {
guard context == &kvoContext else { return super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context) } guard context == &kvoContext else { return super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context) }

2
Delta/Game Selection/GameCollectionViewController.swift
View File

@ -95,7 +95,7 @@ extension GameCollectionViewController
/// Segues /// Segues
extension GameCollectionViewController extension GameCollectionViewController
{ {
override func prepare(for segue: UIStoryboardSegue, sender: AnyObject?) override func prepare(for segue: UIStoryboardSegue, sender: Any?)
{ {
guard let identifier = segue.identifier, identifier == "unwindFromGames" else { return } guard let identifier = segue.identifier, identifier == "unwindFromGames" else { return }

2
Delta/Game Selection/GamesViewController.swift
View File

@ -122,7 +122,7 @@ extension GamesViewController
extension GamesViewController extension GamesViewController
{ {
// In a storyboard-based application, you will often want to do a little preparation before navigation // In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepare(for segue: UIStoryboardSegue, sender: AnyObject?) override func prepare(for segue: UIStoryboardSegue, sender: Any?)
{ {
guard let identifier = segue.identifier, identifier == "embedPageViewController" else { return } guard let identifier = segue.identifier, identifier == "embedPageViewController" else { return }

2
Delta/Launch/LaunchViewController.swift
View File

@ -38,7 +38,7 @@ class LaunchViewController: UIViewController
} }
} }
override func prepare(for segue: UIStoryboardSegue, sender: AnyObject?) override func prepare(for segue: UIStoryboardSegue, sender: Any?)
{ {
guard segue.identifier == "embedGameViewController" else { return } guard segue.identifier == "embedGameViewController" else { return }

2
Delta/Pause Menu/Cheats/EditCheatViewController.swift
View File

@ -200,7 +200,7 @@ extension EditCheatViewController
// Dispose of any resources that can be recreated. // Dispose of any resources that can be recreated.
} }
override func prepare(for segue: UIStoryboardSegue, sender: AnyObject?) override func prepare(for segue: UIStoryboardSegue, sender: Any?)
{ {
self.nameTextField.resignFirstResponder() self.nameTextField.resignFirstResponder()
self.codeTextView.resignFirstResponder() self.codeTextView.resignFirstResponder()

4
Delta/Pause Menu/PauseViewController.swift
View File

@ -68,12 +68,12 @@ class PauseViewController: UIViewController, PauseInfoProviding
extension PauseViewController extension PauseViewController
{ {
override func targetViewController(forAction action: Selector, sender: AnyObject?) -> UIViewController? override func targetViewController(forAction action: Selector, sender: Any?) -> UIViewController?
{ {
return self.pauseNavigationController return self.pauseNavigationController
} }
override func prepare(for segue: UIStoryboardSegue, sender: AnyObject?) override func prepare(for segue: UIStoryboardSegue, sender: Any?)
{ {
guard let identifier = segue.identifier else { return } guard let identifier = segue.identifier else { return }

8
Delta/Pause Menu/Save States/SaveStatesViewController.swift
View File

@ -58,7 +58,7 @@ class SaveStatesViewController: UICollectionViewController
fileprivate var fetchedResultsController: NSFetchedResultsController<NSFetchRequestResult>! fileprivate var fetchedResultsController: NSFetchedResultsController<NSFetchRequestResult>!
fileprivate let imageOperationQueue = RSTOperationQueue() fileprivate let imageOperationQueue = RSTOperationQueue()
fileprivate let imageCache = NSCache<URL, UIImage>() fileprivate let imageCache = NSCache<NSURL, UIImage>()
fileprivate var emulatorCoreSaveState: SaveStateProtocol? fileprivate var emulatorCoreSaveState: SaveStateProtocol?
fileprivate var selectedSaveState: SaveState? fileprivate var selectedSaveState: SaveState?
@ -210,7 +210,7 @@ private extension SaveStatesViewController
imageOperation.isImmediate = true imageOperation.isImmediate = true
} }
self.imageOperationQueue.addOperation(imageOperation, forKey: indexPath) self.imageOperationQueue.addOperation(imageOperation, forKey: indexPath as NSCopying)
} }
let deltaCore = Delta.core(for: self.game.type)! let deltaCore = Delta.core(for: self.game.type)!
@ -558,7 +558,7 @@ extension SaveStatesViewController: UIViewControllerPreviewingDelegate
let saveState = self.fetchedResultsController.object(at: indexPath) as! SaveState let saveState = self.fetchedResultsController.object(at: indexPath) as! SaveState
let actions = self.actionsForSaveState(saveState)?.previewActions ?? [] let actions = self.actionsForSaveState(saveState)?.previewActions ?? []
let previewImage = self.imageCache.object(forKey: saveState.imageFileURL) ?? UIImage(contentsOfFile: saveState.imageFileURL.path) let previewImage = self.imageCache.object(forKey: saveState.imageFileURL as NSURL) ?? UIImage(contentsOfFile: saveState.imageFileURL.path)
let previewGameViewController = PreviewGameViewController() let previewGameViewController = PreviewGameViewController()
previewGameViewController.game = self.game previewGameViewController.game = self.game
@ -658,7 +658,7 @@ extension SaveStatesViewController
override func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) override func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath)
{ {
let operation = self.imageOperationQueue[indexPath] let operation = self.imageOperationQueue[indexPath as NSCopying]
operation?.cancel() operation?.cancel()
} }
} }

2
Delta/Settings/ControllersSettingsViewController.swift
View File

@ -63,7 +63,7 @@ class ControllersSettingsViewController: UITableViewController
//MARK: - Storyboards - //MARK: - Storyboards -
override func prepare(for segue: UIStoryboardSegue, sender: AnyObject?) override func prepare(for segue: UIStoryboardSegue, sender: Any?)
{ {
guard let indexPath = self.tableView.indexPathForSelectedRow else { return } guard let indexPath = self.tableView.indexPathForSelectedRow else { return }

2
Delta/Settings/SettingsViewController.swift
View File

@ -49,7 +49,7 @@ class SettingsViewController: UITableViewController
super.didReceiveMemoryWarning() super.didReceiveMemoryWarning()
} }
override func prepare(for segue: UIStoryboardSegue, sender: AnyObject?) override func prepare(for segue: UIStoryboardSegue, sender: Any?)
{ {
if segue.identifier == SettingsSegues.Controllers.rawValue if segue.identifier == SettingsSegues.Controllers.rawValue
{ {