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

Fix some build errors.

Browse Source
This commit is contained in:
Brent Simmons
2017-09-17 12:54:08 -07:00
parent 1b391c262e
commit c0ce68e64b
17 changed files with 69 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Evergreen/MainWindow/AddFeed/AddFeedController.swift
View File

@@ -58,7 +58,7 @@ class AddFeedController: AddFeedWindowControllerDelegate, FeedFinderDelegate {
func addFeedWindowController(_: AddFeedWindowController, userEnteredURL url: URL, userEnteredTitle title: String?, folder: Folder) {
closeAddFeedSheet(NSModalResponseOK)
closeAddFeedSheet(NSApplication.ModalResponse.OK)
assert(folder.account != nil, "Folder must have an account.")
let account = folder.account ?? AccountManager.sharedInstance.localAccount
@@ -77,7 +77,7 @@ class AddFeedController: AddFeedWindowControllerDelegate, FeedFinderDelegate {
func addFeedWindowControllerUserDidCancel(_: AddFeedWindowController) {
closeAddFeedSheet(NSModalResponseCancel)
closeAddFeedSheet(NSApplication.ModalResponse.cancel)
}
// MARK: FeedFinderDelegate
@@ -128,14 +128,14 @@ private extension AddFeedController {
var urlStringFromPasteboard: String? {
get {
if let urlString = NSPasteboard.rs_urlString(from: NSPasteboard.general()) {
if let urlString = NSPasteboard.rs_urlString(from: NSPasteboard.general) {
return urlString.rs_normalizedURL()
}
return nil
}
}
func closeAddFeedSheet(_ returnCode: NSModalResponse) {
func closeAddFeedSheet(_ returnCode: NSApplication.ModalResponse) {
if let sheetWindow = addFeedWindowController?.window {
hostWindow.endSheet(sheetWindow, returnCode: returnCode)