From 0963573c3adf471c25cf27ef45a7650154d40833 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 9 Dec 2018 12:32:33 -0800 Subject: [PATCH] Update to Swift 4.2. --- NetNewsWire/AppDelegate.swift | 2 +- NetNewsWire/AppImages.swift | 6 +++--- NetNewsWire/Data/SmallIconProvider.swift | 2 +- NetNewsWire/FeedList/FeedListViewController.swift | 2 +- .../Inspector/FeedInspectorViewController.swift | 2 +- .../Inspector/FolderInspectorViewController.swift | 2 +- NetNewsWire/Inspector/InspectorWindowController.swift | 4 ++-- .../MainWindow/AddFeed/AddFeedWindowController.swift | 6 +++--- .../AddFolder/AddFolderWindowController.swift | 2 +- NetNewsWire/MainWindow/MainWindowController.swift | 4 ++-- .../Sidebar/Renaming/RenameWindowController.swift | 4 ++-- .../MainWindow/Sidebar/SidebarOutlineDataSource.swift | 4 ++-- NetNewsWire/MainWindow/Sidebar/UnreadCountView.swift | 2 +- .../Preferences/PreferencesWindowController.swift | 10 +++++----- .../IndeterminateProgressWindowController.swift | 2 +- NetNewsWire/SmartFeeds/PseudoFeed.swift | 2 +- 16 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NetNewsWire/AppDelegate.swift b/NetNewsWire/AppDelegate.swift index d9add1604..e84237787 100644 --- a/NetNewsWire/AppDelegate.swift +++ b/NetNewsWire/AppDelegate.swift @@ -229,7 +229,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, func windowControllerWithName(_ storyboardName: String) -> NSWindowController { - let storyboard = NSStoryboard(name: NSStoryboard.Name(rawValue: storyboardName), bundle: nil) + let storyboard = NSStoryboard(name: NSStoryboard.Name(storyboardName), bundle: nil) return storyboard.instantiateInitialController()! as! NSWindowController } diff --git a/NetNewsWire/AppImages.swift b/NetNewsWire/AppImages.swift index e89ed12d1..5287936bd 100644 --- a/NetNewsWire/AppImages.swift +++ b/NetNewsWire/AppImages.swift @@ -9,9 +9,9 @@ import AppKit extension NSImage.Name { - static let star = NSImage.Name(rawValue: "star") - static let unstar = NSImage.Name(rawValue: "unstar") - static let timelineStar = NSImage.Name(rawValue: "timelineStar") + static let star = NSImage.Name("star") + static let unstar = NSImage.Name("unstar") + static let timelineStar = NSImage.Name("timelineStar") } struct AppImages { diff --git a/NetNewsWire/Data/SmallIconProvider.swift b/NetNewsWire/Data/SmallIconProvider.swift index 46b2a7d85..c2602eb62 100644 --- a/NetNewsWire/Data/SmallIconProvider.swift +++ b/NetNewsWire/Data/SmallIconProvider.swift @@ -28,6 +28,6 @@ extension Feed: SmallIconProvider { extension Folder: SmallIconProvider { var smallIcon: NSImage? { - return NSImage(named: NSImage.Name.folder) + return NSImage(named: NSImage.folderName) } } diff --git a/NetNewsWire/FeedList/FeedListViewController.swift b/NetNewsWire/FeedList/FeedListViewController.swift index 1557180ca..b10f5b2b3 100644 --- a/NetNewsWire/FeedList/FeedListViewController.swift +++ b/NetNewsWire/FeedList/FeedListViewController.swift @@ -155,7 +155,7 @@ private extension FeedListViewController { func imageFor(_ node: Node) -> NSImage? { if let _ = node.representedObject as? FeedListFolder { - return NSImage(named: NSImage.Name.folder) + return NSImage(named: NSImage.folderName) } else if let feed = node.representedObject as? FeedListFeed { if let image = appDelegate.faviconDownloader.favicon(withHomePageURL: feed.homePageURL) { diff --git a/NetNewsWire/Inspector/FeedInspectorViewController.swift b/NetNewsWire/Inspector/FeedInspectorViewController.swift index 29515d59e..b6e55a64e 100644 --- a/NetNewsWire/Inspector/FeedInspectorViewController.swift +++ b/NetNewsWire/Inspector/FeedInspectorViewController.swift @@ -63,7 +63,7 @@ final class FeedInspectorViewController: NSViewController, Inspector { extension FeedInspectorViewController: NSTextFieldDelegate { - override func controlTextDidChange(_ note: Notification) { + func controlTextDidChange(_ note: Notification) { guard let feed = feed, let nameTextField = nameTextField else { return diff --git a/NetNewsWire/Inspector/FolderInspectorViewController.swift b/NetNewsWire/Inspector/FolderInspectorViewController.swift index 15e0b7d40..6f33773ee 100644 --- a/NetNewsWire/Inspector/FolderInspectorViewController.swift +++ b/NetNewsWire/Inspector/FolderInspectorViewController.swift @@ -61,7 +61,7 @@ final class FolderInspectorViewController: NSViewController, Inspector { extension FolderInspectorViewController: NSTextFieldDelegate { - override func controlTextDidChange(_ note: Notification) { + func controlTextDidChange(_ note: Notification) { guard let folder = folder, let nameTextField = nameTextField else { return diff --git a/NetNewsWire/Inspector/InspectorWindowController.swift b/NetNewsWire/Inspector/InspectorWindowController.swift index a77ce578a..01e476bc0 100644 --- a/NetNewsWire/Inspector/InspectorWindowController.swift +++ b/NetNewsWire/Inspector/InspectorWindowController.swift @@ -55,7 +55,7 @@ final class InspectorWindowController: NSWindowController { let nothingInspector = window?.contentViewController as! InspectorViewController - let storyboard = NSStoryboard(name: NSStoryboard.Name(rawValue: "Inspector"), bundle: nil) + let storyboard = NSStoryboard(name: NSStoryboard.Name("Inspector"), bundle: nil) let feedInspector = inspector("Feed", storyboard) let folderInspector = inspector("Folder", storyboard) let builtinSmartFeedInspector = inspector("BuiltinSmartFeed", storyboard) @@ -100,7 +100,7 @@ private extension InspectorWindowController { func inspector(_ identifier: String, _ storyboard: NSStoryboard) -> InspectorViewController { - return storyboard.instantiateController(withIdentifier: NSStoryboard.SceneIdentifier(rawValue: identifier)) as! InspectorViewController + return storyboard.instantiateController(withIdentifier: NSStoryboard.SceneIdentifier(identifier)) as! InspectorViewController } func show(_ inspector: InspectorViewController) { diff --git a/NetNewsWire/MainWindow/AddFeed/AddFeedWindowController.swift b/NetNewsWire/MainWindow/AddFeed/AddFeedWindowController.swift index 59c728a67..5458bbabf 100644 --- a/NetNewsWire/MainWindow/AddFeed/AddFeedWindowController.swift +++ b/NetNewsWire/MainWindow/AddFeed/AddFeedWindowController.swift @@ -46,7 +46,7 @@ class AddFeedWindowController : NSWindowController { convenience init(urlString: String?, name: String?, folder: Folder?, folderTreeController: TreeController, delegate: AddFeedWindowControllerDelegate?) { - self.init(windowNibName: NSNib.Name(rawValue: "AddFeedSheet")) + self.init(windowNibName: NSNib.Name("AddFeedSheet")) self.urlString = urlString self.initialName = name self.initialFolder = folder @@ -121,12 +121,12 @@ class AddFeedWindowController : NSWindowController { // MARK: NSTextFieldDelegate - override func controlTextDidEndEditing(_ obj: Notification) { + func controlTextDidEndEditing(_ obj: Notification) { updateUI() } - override func controlTextDidChange(_ obj: Notification) { + func controlTextDidChange(_ obj: Notification) { updateUI() } diff --git a/NetNewsWire/MainWindow/AddFolder/AddFolderWindowController.swift b/NetNewsWire/MainWindow/AddFolder/AddFolderWindowController.swift index 5f90de909..4086832ef 100644 --- a/NetNewsWire/MainWindow/AddFolder/AddFolderWindowController.swift +++ b/NetNewsWire/MainWindow/AddFolder/AddFolderWindowController.swift @@ -18,7 +18,7 @@ class AddFolderWindowController : NSWindowController { convenience init() { - self.init(windowNibName: NSNib.Name(rawValue: "AddFolderSheet")) + self.init(windowNibName: NSNib.Name("AddFolderSheet")) } // MARK: API diff --git a/NetNewsWire/MainWindow/MainWindowController.swift b/NetNewsWire/MainWindow/MainWindowController.swift index 31800c6ec..70a84a669 100644 --- a/NetNewsWire/MainWindow/MainWindowController.swift +++ b/NetNewsWire/MainWindow/MainWindowController.swift @@ -16,7 +16,7 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations { @IBOutlet var toolbarDelegate: MainWindowToolbarDelegate? private var sharingServicePickerDelegate: NSSharingServicePickerDelegate? - private let windowAutosaveName = NSWindow.FrameAutosaveName(rawValue: "MainWindow") + private let windowAutosaveName = NSWindow.FrameAutosaveName("MainWindow") static var didPositionWindowOnFirstRun = false private var currentFeedOrFolder: AnyObject? = nil { @@ -401,7 +401,7 @@ private extension MainWindowController { guard let viewController = contentViewController else { return nil } - return viewController.childViewControllers.first as? NSSplitViewController + return viewController.children.first as? NSSplitViewController } var sidebarViewController: SidebarViewController? { diff --git a/NetNewsWire/MainWindow/Sidebar/Renaming/RenameWindowController.swift b/NetNewsWire/MainWindow/Sidebar/Renaming/RenameWindowController.swift index 15ce9ad6d..5cb8b6309 100644 --- a/NetNewsWire/MainWindow/Sidebar/Renaming/RenameWindowController.swift +++ b/NetNewsWire/MainWindow/Sidebar/Renaming/RenameWindowController.swift @@ -25,7 +25,7 @@ final class RenameWindowController: NSWindowController { convenience init(originalTitle: String, representedObject: Any, delegate: RenameWindowControllerDelegate) { - self.init(windowNibName: NSNib.Name(rawValue: "RenameSheet")) + self.init(windowNibName: NSNib.Name("RenameSheet")) self.originalTitle = originalTitle self.representedObject = representedObject self.delegate = delegate @@ -62,7 +62,7 @@ final class RenameWindowController: NSWindowController { extension RenameWindowController: NSTextFieldDelegate { - override func controlTextDidChange(_ obj: Notification) { + func controlTextDidChange(_ obj: Notification) { updateUI() } diff --git a/NetNewsWire/MainWindow/Sidebar/SidebarOutlineDataSource.swift b/NetNewsWire/MainWindow/Sidebar/SidebarOutlineDataSource.swift index 0d2a4339d..0dd5b1df8 100644 --- a/NetNewsWire/MainWindow/Sidebar/SidebarOutlineDataSource.swift +++ b/NetNewsWire/MainWindow/Sidebar/SidebarOutlineDataSource.swift @@ -49,7 +49,7 @@ import Account // MARK: - Drag and Drop func outlineView(_ outlineView: NSOutlineView, validateDrop info: NSDraggingInfo, proposedItem item: Any?, proposedChildIndex index: Int) -> NSDragOperation { - guard let draggedFeeds = PasteboardFeed.pasteboardFeeds(with: info.draggingPasteboard()), !draggedFeeds.isEmpty else { + guard let draggedFeeds = PasteboardFeed.pasteboardFeeds(with: info.draggingPasteboard), !draggedFeeds.isEmpty else { return SidebarOutlineDataSource.dragOperationNone } @@ -71,7 +71,7 @@ import Account } func outlineView(_ outlineView: NSOutlineView, acceptDrop info: NSDraggingInfo, item: Any?, childIndex index: Int) -> Bool { - guard let draggedFeeds = PasteboardFeed.pasteboardFeeds(with: info.draggingPasteboard()), !draggedFeeds.isEmpty else { + guard let draggedFeeds = PasteboardFeed.pasteboardFeeds(with: info.draggingPasteboard), !draggedFeeds.isEmpty else { return false } diff --git a/NetNewsWire/MainWindow/Sidebar/UnreadCountView.swift b/NetNewsWire/MainWindow/Sidebar/UnreadCountView.swift index 96f394cd1..54d01ad67 100644 --- a/NetNewsWire/MainWindow/Sidebar/UnreadCountView.swift +++ b/NetNewsWire/MainWindow/Sidebar/UnreadCountView.swift @@ -15,7 +15,7 @@ private let backgroundColor = appDelegate.currentTheme.colorWithAlpha(forKey: "M private let textColor = appDelegate.currentTheme.colorWithAlpha(forKey: "MainWindow.SourceList.unreadCount.color") private let textSize = appDelegate.currentTheme.float(forKey: "MainWindow.SourceList.unreadCount.fontSize") private let textFont = NSFont.systemFont(ofSize: textSize, weight: NSFont.Weight.semibold) -private var textAttributes: [NSAttributedStringKey: AnyObject] = [NSAttributedStringKey.foregroundColor: textColor, NSAttributedStringKey.font: textFont, NSAttributedStringKey.kern: NSNull()] +private var textAttributes: [NSAttributedString.Key: AnyObject] = [NSAttributedString.Key.foregroundColor: textColor, NSAttributedString.Key.font: textFont, NSAttributedString.Key.kern: NSNull()] private var textSizeCache = [Int: NSSize]() class UnreadCountView : NSView { diff --git a/NetNewsWire/Preferences/PreferencesWindowController.swift b/NetNewsWire/Preferences/PreferencesWindowController.swift index e3b4bdb35..bceb51a61 100644 --- a/NetNewsWire/Preferences/PreferencesWindowController.swift +++ b/NetNewsWire/Preferences/PreferencesWindowController.swift @@ -30,14 +30,14 @@ class PreferencesWindowController : NSWindowController, NSToolbarDelegate { fileprivate var viewControllers = [String: NSViewController]() fileprivate let toolbarItemSpecs: [PreferencesToolbarItemSpec] = { var specs = [PreferencesToolbarItemSpec]() - specs += [PreferencesToolbarItemSpec(identifierRawValue: toolbarItemIdentifierGeneral, name: NSLocalizedString("General", comment: "Preferences"), imageName: NSImage.Name.preferencesGeneral)] + specs += [PreferencesToolbarItemSpec(identifierRawValue: toolbarItemIdentifierGeneral, name: NSLocalizedString("General", comment: "Preferences"), imageName: NSImage.preferencesGeneralName)] return specs }() override func windowDidLoad() { - let toolbar = NSToolbar(identifier: NSToolbar.Identifier(rawValue: "PreferencesToolbar")) + let toolbar = NSToolbar(identifier: NSToolbar.Identifier("PreferencesToolbar")) toolbar.delegate = self toolbar.autosavesConfiguration = false toolbar.allowsUserCustomization = false @@ -47,7 +47,7 @@ class PreferencesWindowController : NSWindowController, NSToolbarDelegate { window?.showsToolbarButton = false window?.toolbar = toolbar - window?.setFrameAutosaveName(NSWindow.FrameAutosaveName(rawValue: windowFrameName)) + window?.setFrameAutosaveName(NSWindow.FrameAutosaveName(windowFrameName)) switchToViewAtIndex(0) } @@ -149,8 +149,8 @@ private extension PreferencesWindowController { return cachedViewController } - let storyboard = NSStoryboard(name: NSStoryboard.Name(rawValue: "Preferences"), bundle: nil) - guard let viewController = storyboard.instantiateController(withIdentifier: NSStoryboard.SceneIdentifier(rawValue: identifier)) as? NSViewController else { + let storyboard = NSStoryboard(name: NSStoryboard.Name("Preferences"), bundle: nil) + guard let viewController = storyboard.instantiateController(withIdentifier: NSStoryboard.SceneIdentifier(identifier)) as? NSViewController else { assertionFailure("Unknown preferences view controller: \(identifier)") return nil } diff --git a/NetNewsWire/ProgressWindow/IndeterminateProgressWindowController.swift b/NetNewsWire/ProgressWindow/IndeterminateProgressWindowController.swift index cb5e85526..2eae0dafc 100644 --- a/NetNewsWire/ProgressWindow/IndeterminateProgressWindowController.swift +++ b/NetNewsWire/ProgressWindow/IndeterminateProgressWindowController.swift @@ -57,7 +57,7 @@ private final class IndeterminateProgressWindowController: NSWindowController { convenience init(message: String) { - self.init(windowNibName: NSNib.Name(rawValue: "IndeterminateProgressWindow")) + self.init(windowNibName: NSNib.Name("IndeterminateProgressWindow")) self.message = message } diff --git a/NetNewsWire/SmartFeeds/PseudoFeed.swift b/NetNewsWire/SmartFeeds/PseudoFeed.swift index 37e5c7652..a8a59d565 100644 --- a/NetNewsWire/SmartFeeds/PseudoFeed.swift +++ b/NetNewsWire/SmartFeeds/PseudoFeed.swift @@ -17,7 +17,7 @@ protocol PseudoFeed: class, DisplayNameProvider, UnreadCountProvider, SmallIconP private var smartFeedIcon: NSImage = { - return NSImage(named: NSImage.Name.smartBadgeTemplate)! + return NSImage(named: NSImage.smartBadgeTemplateName)! }() extension PseudoFeed {