renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to Swift 4.2.

Browse Source
This commit is contained in:
Brent Simmons
2018-12-09 12:32:33 -08:00
parent 525ce29f20
commit 0963573c3a
16 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NetNewsWire/AppDelegate.swift
View File

@@ -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
}

6
NetNewsWire/AppImages.swift
View File

@@ -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 {

2
NetNewsWire/Data/SmallIconProvider.swift
View File

@@ -28,6 +28,6 @@ extension Feed: SmallIconProvider {
extension Folder: SmallIconProvider {
var smallIcon: NSImage? {
return NSImage(named: NSImage.Name.folder)
return NSImage(named: NSImage.folderName)
}
}

2
NetNewsWire/FeedList/FeedListViewController.swift
View File

@@ -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) {

2
NetNewsWire/Inspector/FeedInspectorViewController.swift
View File

@@ -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

2
NetNewsWire/Inspector/FolderInspectorViewController.swift
View File

@@ -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

4
NetNewsWire/Inspector/InspectorWindowController.swift
View File

@@ -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) {

6
NetNewsWire/MainWindow/AddFeed/AddFeedWindowController.swift
View File

@@ -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()
}

2
NetNewsWire/MainWindow/AddFolder/AddFolderWindowController.swift
View File

@@ -18,7 +18,7 @@ class AddFolderWindowController : NSWindowController {
convenience init() {
self.init(windowNibName: NSNib.Name(rawValue: "AddFolderSheet"))
self.init(windowNibName: NSNib.Name("AddFolderSheet"))
}
// MARK: API

4
NetNewsWire/MainWindow/MainWindowController.swift
View File

@@ -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? {

4
NetNewsWire/MainWindow/Sidebar/Renaming/RenameWindowController.swift
View File

@@ -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()
}

4
NetNewsWire/MainWindow/Sidebar/SidebarOutlineDataSource.swift
View File

@@ -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
}

2
NetNewsWire/MainWindow/Sidebar/UnreadCountView.swift
View File

@@ -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 {

10
NetNewsWire/Preferences/PreferencesWindowController.swift
View File

@@ -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
}

2
NetNewsWire/ProgressWindow/IndeterminateProgressWindowController.swift
View File

@@ -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
}

2
NetNewsWire/SmartFeeds/PseudoFeed.swift
View File

@@ -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 {