From 50dcf436d9cd4a3854220b53ae7557c877bff744 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Fri, 2 Feb 2018 22:51:32 -0800 Subject: [PATCH] =?UTF-8?q?Change=20Cocoa=20imports=20to=20AppKit=20import?= =?UTF-8?q?s,=20because=20we=20don=E2=80=99t=20need=20CoreData=20imported?= =?UTF-8?q?=20(which=20Cocoa=20imports).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Commands/SendToCommand.swift | 2 +- Commands/SendToMarsEditCommand.swift | 2 +- Commands/SendToMicroBlogCommand.swift | 2 +- Evergreen/AppDelegate.swift | 2 +- Evergreen/AppNotifications.swift | 2 +- Evergreen/Data/SmallIconProvider.swift | 2 +- Evergreen/Dinosaurs/DinosaursWindowController.swift | 2 +- Evergreen/FeedList/FeedListControlsView.swift | 2 +- Evergreen/FeedList/FeedListSplitViewController.swift | 2 +- Evergreen/FeedList/FeedListViewController.swift | 2 +- Evergreen/FeedList/FeedListWindowController.swift | 2 +- Evergreen/Images/AuthorAvatarDownloader.swift | 2 +- Evergreen/Images/FeaturedImageDownloader.swift | 2 +- Evergreen/Images/FeedIconDownloader.swift | 2 +- Evergreen/MainWindow/AddFeed/AddFeedController.swift | 2 +- Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift | 2 +- .../MainWindow/AddFolder/AddFolderWindowController.swift | 2 +- Evergreen/MainWindow/Detail/DetailStatusBarView.swift | 2 +- Evergreen/MainWindow/Keyboard/MainWIndowKeyboardHandler.swift | 2 +- Evergreen/MainWindow/KeyboardDelegateProtocol.swift | 2 +- Evergreen/MainWindow/MainWindowController.swift | 2 +- Evergreen/MainWindow/MainWindowSplitView.swift | 2 +- Evergreen/MainWindow/Sidebar/Cell/SidebarCellAppearance.swift | 2 +- Evergreen/MainWindow/Sidebar/Cell/SidebarCellLayout.swift | 2 +- Evergreen/MainWindow/Sidebar/FeedPasteboardWriter.swift | 2 +- .../MainWindow/Sidebar/Keyboard/SidebarKeyboardDelegate.swift | 2 +- .../MainWindow/Sidebar/Renaming/RenameWindowController.swift | 4 +++- Evergreen/MainWindow/Sidebar/SidebarStatusBarView.swift | 2 +- Evergreen/MainWindow/Sidebar/UnreadCountView.swift | 2 +- Evergreen/MainWindow/Timeline/ArticlePasteboardWriter.swift | 2 +- .../MainWindow/Timeline/Cell/TimelineCellAppearance.swift | 2 +- Evergreen/MainWindow/Timeline/Cell/TimelineCellData.swift | 2 +- Evergreen/MainWindow/Timeline/Cell/TimelineCellLayout.swift | 2 +- Evergreen/MainWindow/Timeline/Cell/UnreadIndicatorView.swift | 2 +- .../Timeline/Keyboard/TimelineKeyboardDelegate.swift | 2 +- Evergreen/MainWindow/Timeline/TimelineHeaderView.swift | 2 +- Evergreen/MainWindow/Timeline/TimelineTableRowView.swift | 2 +- Evergreen/MainWindow/Timeline/TimelineTableView.swift | 2 +- Evergreen/Preferences/PreferencesWindowController.swift | 2 +- .../IndeterminateProgressWindowController.swift | 2 +- Evergreen/Scriptability/Account+Scriptability.swift | 2 +- Evergreen/Scriptability/NSApplication+Scriptability.swift | 2 +- Evergreen/Scriptability/ScriptingObjectContainer.swift | 2 +- Frameworks/DB5/DB5/DB5.h | 2 +- Frameworks/DB5/DB5/VSTheme.h | 2 +- Frameworks/RSCore/RSCore/AppKit/LogWindowController.swift | 2 +- .../RSCore/RSCore/AppKit/NSAppleEventDescriptor+RSCore.h | 2 +- Frameworks/RSCore/RSCore/AppKit/SendToBlogEditorApp.h | 2 +- Frameworks/RSCore/RSCore/AppKit/UserApp.swift | 2 +- Frameworks/RSCore/RSCore/AppKit/WebViewWindowController.swift | 2 +- Frameworks/RSCore/RSCore/Images/NSImage+RSCore.swift | 2 +- Frameworks/RSCore/RSCore/Keyboard.swift | 2 +- Frameworks/RSCore/RSCore/NSCalendar+RSCore.m | 2 +- Frameworks/RSCore/RSCore/NSColor+RSCore.h | 2 +- Frameworks/RSCore/RSCore/NSImage+RSCore.h | 2 +- Frameworks/RSCore/RSCore/NSOutlineView+Extensions.swift | 2 +- Frameworks/RSCore/RSCore/NSResponder-Extensions.swift | 2 +- Frameworks/RSCore/RSCore/NSStoryboard+RSCore.h | 2 +- Frameworks/RSCore/RSCore/NSTableView+Extensions.swift | 2 +- Frameworks/RSCore/RSCore/NSTableView+RSCore.h | 2 +- Frameworks/RSCore/RSCore/NSView+RSCore.h | 2 +- Frameworks/RSCore/RSCore/NSWindow-Extensions.swift | 2 +- Frameworks/RSCore/RSCore/RSBackgroundColorView.h | 2 +- Frameworks/RSCore/RSCore/RSOpaqueContainerView.h | 2 +- Frameworks/RSCore/RSCore/RSToolbarItem.swift | 2 +- Frameworks/RSCore/RSCore/RSTransparentContainerView.h | 2 +- Frameworks/RSCore/RSCoreTests/RSCoreTests.m | 2 +- Frameworks/RSFeedFinder/RSFeedFinder/RSFeedFinder.h | 2 +- Frameworks/RSTextDrawing/RSTextDrawing/RSMultiLineRenderer.h | 2 +- Frameworks/RSTextDrawing/RSTextDrawing/RSMultiLineView.h | 2 +- Frameworks/RSTextDrawing/RSTextDrawing/RSSingleLineRenderer.h | 2 +- Frameworks/RSTextDrawing/RSTextDrawing/RSSingleLineView.h | 2 +- Frameworks/RSTextDrawing/RSTextDrawing/RSTextDrawing.h | 2 +- .../RSTextDrawing/RSTextDrawing/RSTextRendererProtocol.h | 2 +- Frameworks/RSTree/RSTree/NSOutlineView+RSTree.swift | 2 +- Frameworks/RSTree/RSTree/RSTree.h | 2 +- Frameworks/RSWeb/RSWeb/MacWebBrowser.swift | 2 +- 77 files changed, 79 insertions(+), 77 deletions(-) diff --git a/Commands/SendToCommand.swift b/Commands/SendToCommand.swift index e7e13368f..7b67b3883 100644 --- a/Commands/SendToCommand.swift +++ b/Commands/SendToCommand.swift @@ -6,7 +6,7 @@ // Copyright © 2018 Ranchero Software. All rights reserved. // -import Cocoa +import AppKit // Unlike UndoableCommand commands, you instantiate one of each of these and reuse them. diff --git a/Commands/SendToMarsEditCommand.swift b/Commands/SendToMarsEditCommand.swift index 1b9ec0f6e..364ce6787 100644 --- a/Commands/SendToMarsEditCommand.swift +++ b/Commands/SendToMarsEditCommand.swift @@ -6,7 +6,7 @@ // Copyright © 2018 Ranchero Software. All rights reserved. // -import Cocoa +import AppKit import RSCore import Data diff --git a/Commands/SendToMicroBlogCommand.swift b/Commands/SendToMicroBlogCommand.swift index d3d710448..c3b46e782 100644 --- a/Commands/SendToMicroBlogCommand.swift +++ b/Commands/SendToMicroBlogCommand.swift @@ -6,7 +6,7 @@ // Copyright © 2018 Ranchero Software. All rights reserved. // -import Cocoa +import AppKit import Data import RSCore diff --git a/Evergreen/AppDelegate.swift b/Evergreen/AppDelegate.swift index 0b4f9b52a..36f04da16 100644 --- a/Evergreen/AppDelegate.swift +++ b/Evergreen/AppDelegate.swift @@ -6,7 +6,7 @@ // Copyright © 2015 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit import DB5 import Data import RSTextDrawing diff --git a/Evergreen/AppNotifications.swift b/Evergreen/AppNotifications.swift index da9285a5d..b2e419cab 100644 --- a/Evergreen/AppNotifications.swift +++ b/Evergreen/AppNotifications.swift @@ -6,7 +6,7 @@ // Copyright © 2015 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit import Data extension Notification.Name { diff --git a/Evergreen/Data/SmallIconProvider.swift b/Evergreen/Data/SmallIconProvider.swift index bdd3c4659..b62fd2688 100644 --- a/Evergreen/Data/SmallIconProvider.swift +++ b/Evergreen/Data/SmallIconProvider.swift @@ -6,7 +6,7 @@ // Copyright © 2017 Ranchero Software. All rights reserved. // -import Cocoa +import AppKit protocol SmallIconProvider { diff --git a/Evergreen/Dinosaurs/DinosaursWindowController.swift b/Evergreen/Dinosaurs/DinosaursWindowController.swift index 1af4ab749..ffc09e849 100644 --- a/Evergreen/Dinosaurs/DinosaursWindowController.swift +++ b/Evergreen/Dinosaurs/DinosaursWindowController.swift @@ -6,7 +6,7 @@ // Copyright © 2017 Ranchero Software. All rights reserved. // -import Cocoa +import AppKit class DinosaursWindowController: NSWindowController { diff --git a/Evergreen/FeedList/FeedListControlsView.swift b/Evergreen/FeedList/FeedListControlsView.swift index 9c0688b27..0943bfe3b 100644 --- a/Evergreen/FeedList/FeedListControlsView.swift +++ b/Evergreen/FeedList/FeedListControlsView.swift @@ -6,7 +6,7 @@ // Copyright © 2017 Ranchero Software. All rights reserved. // -import Cocoa +import AppKit @objc final class FeedListControlsView: NSView { diff --git a/Evergreen/FeedList/FeedListSplitViewController.swift b/Evergreen/FeedList/FeedListSplitViewController.swift index 9e1691147..9a82f1f40 100644 --- a/Evergreen/FeedList/FeedListSplitViewController.swift +++ b/Evergreen/FeedList/FeedListSplitViewController.swift @@ -6,7 +6,7 @@ // Copyright © 2017 Ranchero Software. All rights reserved. // -import Cocoa +import AppKit class FeedListSplitViewController: NSSplitViewController { diff --git a/Evergreen/FeedList/FeedListViewController.swift b/Evergreen/FeedList/FeedListViewController.swift index ef1c0abda..b885478ab 100644 --- a/Evergreen/FeedList/FeedListViewController.swift +++ b/Evergreen/FeedList/FeedListViewController.swift @@ -6,7 +6,7 @@ // Copyright © 2017 Ranchero Software. All rights reserved. // -import Cocoa +import AppKit import RSTree import RSCore diff --git a/Evergreen/FeedList/FeedListWindowController.swift b/Evergreen/FeedList/FeedListWindowController.swift index 934a1aa43..e4e2f215c 100644 --- a/Evergreen/FeedList/FeedListWindowController.swift +++ b/Evergreen/FeedList/FeedListWindowController.swift @@ -6,7 +6,7 @@ // Copyright © 2015 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit class FeedListWindowController : NSWindowController { diff --git a/Evergreen/Images/AuthorAvatarDownloader.swift b/Evergreen/Images/AuthorAvatarDownloader.swift index 8965a0457..d3d5f5c4c 100644 --- a/Evergreen/Images/AuthorAvatarDownloader.swift +++ b/Evergreen/Images/AuthorAvatarDownloader.swift @@ -6,7 +6,7 @@ // Copyright © 2017 Ranchero Software. All rights reserved. // -import Cocoa +import AppKit import Data extension Notification.Name { diff --git a/Evergreen/Images/FeaturedImageDownloader.swift b/Evergreen/Images/FeaturedImageDownloader.swift index 3b429c3fb..f81b5c654 100644 --- a/Evergreen/Images/FeaturedImageDownloader.swift +++ b/Evergreen/Images/FeaturedImageDownloader.swift @@ -6,7 +6,7 @@ // Copyright © 2017 Ranchero Software. All rights reserved. // -import Cocoa +import AppKit import Data import RSParser diff --git a/Evergreen/Images/FeedIconDownloader.swift b/Evergreen/Images/FeedIconDownloader.swift index 560d563dd..ccf6fee46 100644 --- a/Evergreen/Images/FeedIconDownloader.swift +++ b/Evergreen/Images/FeedIconDownloader.swift @@ -6,7 +6,7 @@ // Copyright © 2017 Ranchero Software. All rights reserved. // -import Cocoa +import AppKit import Data import RSWeb import RSParser diff --git a/Evergreen/MainWindow/AddFeed/AddFeedController.swift b/Evergreen/MainWindow/AddFeed/AddFeedController.swift index 816d7149b..d177f9030 100644 --- a/Evergreen/MainWindow/AddFeed/AddFeedController.swift +++ b/Evergreen/MainWindow/AddFeed/AddFeedController.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit import RSCore import RSTree import Data diff --git a/Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift b/Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift index 706ed151f..44e8000ef 100644 --- a/Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift +++ b/Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift @@ -6,7 +6,7 @@ // Copyright © 2015 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit import RSCore import RSTree import Data diff --git a/Evergreen/MainWindow/AddFolder/AddFolderWindowController.swift b/Evergreen/MainWindow/AddFolder/AddFolderWindowController.swift index 03a78ee9a..15cbdeda8 100644 --- a/Evergreen/MainWindow/AddFolder/AddFolderWindowController.swift +++ b/Evergreen/MainWindow/AddFolder/AddFolderWindowController.swift @@ -6,7 +6,7 @@ // Copyright © 2015 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit import Data import Account diff --git a/Evergreen/MainWindow/Detail/DetailStatusBarView.swift b/Evergreen/MainWindow/Detail/DetailStatusBarView.swift index 464a189d8..9b13a2ac3 100644 --- a/Evergreen/MainWindow/Detail/DetailStatusBarView.swift +++ b/Evergreen/MainWindow/Detail/DetailStatusBarView.swift @@ -6,7 +6,7 @@ // Copyright © 2017 Ranchero Software. All rights reserved. // -import Cocoa +import AppKit import DB5 import Data diff --git a/Evergreen/MainWindow/Keyboard/MainWIndowKeyboardHandler.swift b/Evergreen/MainWindow/Keyboard/MainWIndowKeyboardHandler.swift index e2a9ba3d1..f2f0cd038 100644 --- a/Evergreen/MainWindow/Keyboard/MainWIndowKeyboardHandler.swift +++ b/Evergreen/MainWindow/Keyboard/MainWIndowKeyboardHandler.swift @@ -6,7 +6,7 @@ // Copyright © 2017 Ranchero Software. All rights reserved. // -import Cocoa +import AppKit import RSCore final class MainWindowKeyboardHandler: KeyboardDelegate { diff --git a/Evergreen/MainWindow/KeyboardDelegateProtocol.swift b/Evergreen/MainWindow/KeyboardDelegateProtocol.swift index 2c288e42b..b0cfcc54a 100644 --- a/Evergreen/MainWindow/KeyboardDelegateProtocol.swift +++ b/Evergreen/MainWindow/KeyboardDelegateProtocol.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit let keypadEnter: unichar = 3 diff --git a/Evergreen/MainWindow/MainWindowController.swift b/Evergreen/MainWindow/MainWindowController.swift index fbbbfdcdb..c31e811d2 100644 --- a/Evergreen/MainWindow/MainWindowController.swift +++ b/Evergreen/MainWindow/MainWindowController.swift @@ -6,7 +6,7 @@ // Copyright © 2015 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit import Data import Account diff --git a/Evergreen/MainWindow/MainWindowSplitView.swift b/Evergreen/MainWindow/MainWindowSplitView.swift index e0b381fa3..e7e21ca97 100644 --- a/Evergreen/MainWindow/MainWindowSplitView.swift +++ b/Evergreen/MainWindow/MainWindowSplitView.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit class MainWindowSplitView: NSSplitView { diff --git a/Evergreen/MainWindow/Sidebar/Cell/SidebarCellAppearance.swift b/Evergreen/MainWindow/Sidebar/Cell/SidebarCellAppearance.swift index 3ed976985..dfd5326c8 100644 --- a/Evergreen/MainWindow/Sidebar/Cell/SidebarCellAppearance.swift +++ b/Evergreen/MainWindow/Sidebar/Cell/SidebarCellAppearance.swift @@ -6,7 +6,7 @@ // Copyright © 2017 Ranchero Software. All rights reserved. // -import Cocoa +import AppKit import DB5 struct SidebarCellAppearance: Equatable { diff --git a/Evergreen/MainWindow/Sidebar/Cell/SidebarCellLayout.swift b/Evergreen/MainWindow/Sidebar/Cell/SidebarCellLayout.swift index e36e71f2f..a05f59c8e 100644 --- a/Evergreen/MainWindow/Sidebar/Cell/SidebarCellLayout.swift +++ b/Evergreen/MainWindow/Sidebar/Cell/SidebarCellLayout.swift @@ -6,7 +6,7 @@ // Copyright © 2017 Ranchero Software. All rights reserved. // -import Cocoa +import AppKit import RSCore // image - title - unreadCount diff --git a/Evergreen/MainWindow/Sidebar/FeedPasteboardWriter.swift b/Evergreen/MainWindow/Sidebar/FeedPasteboardWriter.swift index 780719a87..bfeba3f1f 100644 --- a/Evergreen/MainWindow/Sidebar/FeedPasteboardWriter.swift +++ b/Evergreen/MainWindow/Sidebar/FeedPasteboardWriter.swift @@ -6,7 +6,7 @@ // Copyright © 2017 Ranchero Software. All rights reserved. // -import Cocoa +import AppKit import Data @objc final class FeedPasteboardWriter: NSObject, NSPasteboardWriting { diff --git a/Evergreen/MainWindow/Sidebar/Keyboard/SidebarKeyboardDelegate.swift b/Evergreen/MainWindow/Sidebar/Keyboard/SidebarKeyboardDelegate.swift index 0e993314a..1f1f6986b 100644 --- a/Evergreen/MainWindow/Sidebar/Keyboard/SidebarKeyboardDelegate.swift +++ b/Evergreen/MainWindow/Sidebar/Keyboard/SidebarKeyboardDelegate.swift @@ -6,7 +6,7 @@ // Copyright © 2017 Ranchero Software. All rights reserved. // -import Cocoa +import AppKit import RSCore @objc final class SidebarKeyboardDelegate: NSObject, KeyboardDelegate { diff --git a/Evergreen/MainWindow/Sidebar/Renaming/RenameWindowController.swift b/Evergreen/MainWindow/Sidebar/Renaming/RenameWindowController.swift index d6d0b93ee..206f25557 100644 --- a/Evergreen/MainWindow/Sidebar/Renaming/RenameWindowController.swift +++ b/Evergreen/MainWindow/Sidebar/Renaming/RenameWindowController.swift @@ -6,4 +6,6 @@ // Copyright © 2018 Ranchero Software. All rights reserved. // -import Foundation +import AppKit + + diff --git a/Evergreen/MainWindow/Sidebar/SidebarStatusBarView.swift b/Evergreen/MainWindow/Sidebar/SidebarStatusBarView.swift index c33bc67c5..0da539ef1 100644 --- a/Evergreen/MainWindow/Sidebar/SidebarStatusBarView.swift +++ b/Evergreen/MainWindow/Sidebar/SidebarStatusBarView.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit import RSCore import Data import RSWeb diff --git a/Evergreen/MainWindow/Sidebar/UnreadCountView.swift b/Evergreen/MainWindow/Sidebar/UnreadCountView.swift index d8ce75859..eec7f7f73 100644 --- a/Evergreen/MainWindow/Sidebar/UnreadCountView.swift +++ b/Evergreen/MainWindow/Sidebar/UnreadCountView.swift @@ -7,7 +7,7 @@ // import Foundation -import Cocoa +import AppKit private let padding = appDelegate.currentTheme.edgeInsets(forKey: "MainWindow.SourceList.unreadCount.padding") private let cornerRadius = appDelegate.currentTheme.float(forKey: "MainWindow.SourceList.unreadCount.cornerRadius") diff --git a/Evergreen/MainWindow/Timeline/ArticlePasteboardWriter.swift b/Evergreen/MainWindow/Timeline/ArticlePasteboardWriter.swift index faf5b41fe..a3f904b05 100644 --- a/Evergreen/MainWindow/Timeline/ArticlePasteboardWriter.swift +++ b/Evergreen/MainWindow/Timeline/ArticlePasteboardWriter.swift @@ -6,7 +6,7 @@ // Copyright © 2017 Ranchero Software. All rights reserved. // -import Cocoa +import AppKit import Data @objc final class ArticlePasteboardWriter: NSObject, NSPasteboardWriting { diff --git a/Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift b/Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift index f360bb35e..875ff7c10 100644 --- a/Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift +++ b/Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit import DB5 struct TimelineCellAppearance: Equatable { diff --git a/Evergreen/MainWindow/Timeline/Cell/TimelineCellData.swift b/Evergreen/MainWindow/Timeline/Cell/TimelineCellData.swift index 30586f67b..314a52d4f 100644 --- a/Evergreen/MainWindow/Timeline/Cell/TimelineCellData.swift +++ b/Evergreen/MainWindow/Timeline/Cell/TimelineCellData.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit import Data var attributedTitleCache = [String: NSAttributedString]() diff --git a/Evergreen/MainWindow/Timeline/Cell/TimelineCellLayout.swift b/Evergreen/MainWindow/Timeline/Cell/TimelineCellLayout.swift index b59a9bbb4..decf3dffc 100644 --- a/Evergreen/MainWindow/Timeline/Cell/TimelineCellLayout.swift +++ b/Evergreen/MainWindow/Timeline/Cell/TimelineCellLayout.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit import RSTextDrawing import RSCore diff --git a/Evergreen/MainWindow/Timeline/Cell/UnreadIndicatorView.swift b/Evergreen/MainWindow/Timeline/Cell/UnreadIndicatorView.swift index d6b446af6..55aa123f1 100644 --- a/Evergreen/MainWindow/Timeline/Cell/UnreadIndicatorView.swift +++ b/Evergreen/MainWindow/Timeline/Cell/UnreadIndicatorView.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit class UnreadIndicatorView: NSView { diff --git a/Evergreen/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift b/Evergreen/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift index d15d0be50..3a4a0242f 100644 --- a/Evergreen/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift +++ b/Evergreen/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift @@ -6,7 +6,7 @@ // Copyright © 2017 Ranchero Software. All rights reserved. // -import Cocoa +import AppKit import RSCore // Doesn’t have any shortcuts of its own — they’re all in MainWindowKeyboardHandler. diff --git a/Evergreen/MainWindow/Timeline/TimelineHeaderView.swift b/Evergreen/MainWindow/Timeline/TimelineHeaderView.swift index d5a2d09b6..80d0a7539 100644 --- a/Evergreen/MainWindow/Timeline/TimelineHeaderView.swift +++ b/Evergreen/MainWindow/Timeline/TimelineHeaderView.swift @@ -6,7 +6,7 @@ // Copyright © 2017 Ranchero Software. All rights reserved. // -import Cocoa +import AppKit final class TimelineHeaderView: NSView { diff --git a/Evergreen/MainWindow/Timeline/TimelineTableRowView.swift b/Evergreen/MainWindow/Timeline/TimelineTableRowView.swift index 6307a65d7..772396041 100644 --- a/Evergreen/MainWindow/Timeline/TimelineTableRowView.swift +++ b/Evergreen/MainWindow/Timeline/TimelineTableRowView.swift @@ -6,7 +6,7 @@ // Copyright © 2015 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit class TimelineTableRowView : NSTableRowView { diff --git a/Evergreen/MainWindow/Timeline/TimelineTableView.swift b/Evergreen/MainWindow/Timeline/TimelineTableView.swift index 386541047..03fa75fd2 100644 --- a/Evergreen/MainWindow/Timeline/TimelineTableView.swift +++ b/Evergreen/MainWindow/Timeline/TimelineTableView.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit class TimelineTableView: NSTableView { diff --git a/Evergreen/Preferences/PreferencesWindowController.swift b/Evergreen/Preferences/PreferencesWindowController.swift index b64ac3116..ee4b83d94 100644 --- a/Evergreen/Preferences/PreferencesWindowController.swift +++ b/Evergreen/Preferences/PreferencesWindowController.swift @@ -6,7 +6,7 @@ // Copyright © 2015 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit private struct PreferencesToolbarItemSpec { diff --git a/Evergreen/ProgressWindow/IndeterminateProgressWindowController.swift b/Evergreen/ProgressWindow/IndeterminateProgressWindowController.swift index b09b28894..40d0cef57 100644 --- a/Evergreen/ProgressWindow/IndeterminateProgressWindowController.swift +++ b/Evergreen/ProgressWindow/IndeterminateProgressWindowController.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit func runIndeterminateProgressWithMessage(_ message: String) { diff --git a/Evergreen/Scriptability/Account+Scriptability.swift b/Evergreen/Scriptability/Account+Scriptability.swift index bd2c7cbf0..5bc8ac248 100644 --- a/Evergreen/Scriptability/Account+Scriptability.swift +++ b/Evergreen/Scriptability/Account+Scriptability.swift @@ -6,7 +6,7 @@ // Copyright © 2018 Olof Hellman. All rights reserved. // -import Cocoa +import AppKit import Account import Data diff --git a/Evergreen/Scriptability/NSApplication+Scriptability.swift b/Evergreen/Scriptability/NSApplication+Scriptability.swift index 1fc26d668..61903af5f 100644 --- a/Evergreen/Scriptability/NSApplication+Scriptability.swift +++ b/Evergreen/Scriptability/NSApplication+Scriptability.swift @@ -6,7 +6,7 @@ // Copyright © 2018 Olof Hellman. All rights reserved. // -import Cocoa +import AppKit import Account import Data diff --git a/Evergreen/Scriptability/ScriptingObjectContainer.swift b/Evergreen/Scriptability/ScriptingObjectContainer.swift index fbe11adde..d03ca88cf 100644 --- a/Evergreen/Scriptability/ScriptingObjectContainer.swift +++ b/Evergreen/Scriptability/ScriptingObjectContainer.swift @@ -6,7 +6,7 @@ // Copyright © 2018 Olof Hellman. All rights reserved. // -import Cocoa +import AppKit protocol ScriptingObjectContainer: ScriptingObject { var scriptingClassDescription:NSScriptClassDescription { get } diff --git a/Frameworks/DB5/DB5/DB5.h b/Frameworks/DB5/DB5/DB5.h index ae3d237e1..15243eb88 100644 --- a/Frameworks/DB5/DB5/DB5.h +++ b/Frameworks/DB5/DB5/DB5.h @@ -6,7 +6,7 @@ // Copyright © 2015 Ranchero Software, LLC. All rights reserved. // -#import +@import AppKit; //! Project version number for DB5. FOUNDATION_EXPORT double DB5VersionNumber; diff --git a/Frameworks/DB5/DB5/VSTheme.h b/Frameworks/DB5/DB5/VSTheme.h index 78fefaecd..89347021f 100644 --- a/Frameworks/DB5/DB5/VSTheme.h +++ b/Frameworks/DB5/DB5/VSTheme.h @@ -6,7 +6,7 @@ // Copyright (c) 2012 Q Branch LLC. All rights reserved. // -@import Cocoa; +@import AppKit; NS_ASSUME_NONNULL_BEGIN diff --git a/Frameworks/RSCore/RSCore/AppKit/LogWindowController.swift b/Frameworks/RSCore/RSCore/AppKit/LogWindowController.swift index 0dcfee270..2412270de 100644 --- a/Frameworks/RSCore/RSCore/AppKit/LogWindowController.swift +++ b/Frameworks/RSCore/RSCore/AppKit/LogWindowController.swift @@ -6,7 +6,7 @@ // Copyright © 2017 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit public class LogWindowController: NSWindowController { diff --git a/Frameworks/RSCore/RSCore/AppKit/NSAppleEventDescriptor+RSCore.h b/Frameworks/RSCore/RSCore/AppKit/NSAppleEventDescriptor+RSCore.h index 6bd02b28e..34acf0036 100644 --- a/Frameworks/RSCore/RSCore/AppKit/NSAppleEventDescriptor+RSCore.h +++ b/Frameworks/RSCore/RSCore/AppKit/NSAppleEventDescriptor+RSCore.h @@ -6,7 +6,7 @@ // Copyright © 2018 Ranchero Software, LLC. All rights reserved. // -@import Cocoa; +@import AppKit; NS_ASSUME_NONNULL_BEGIN diff --git a/Frameworks/RSCore/RSCore/AppKit/SendToBlogEditorApp.h b/Frameworks/RSCore/RSCore/AppKit/SendToBlogEditorApp.h index 535ad2a21..7de4bd282 100644 --- a/Frameworks/RSCore/RSCore/AppKit/SendToBlogEditorApp.h +++ b/Frameworks/RSCore/RSCore/AppKit/SendToBlogEditorApp.h @@ -6,7 +6,7 @@ // Copyright © 2018 Ranchero Software, LLC. All rights reserved. // -@import Cocoa; +@import AppKit; // This is for sending articles to MarsEdit and other apps that implement the send-to-blog-editor Apple events API: // http://ranchero.com/netnewswire/developers/externalinterface diff --git a/Frameworks/RSCore/RSCore/AppKit/UserApp.swift b/Frameworks/RSCore/RSCore/AppKit/UserApp.swift index 164192ad8..4103e3eea 100644 --- a/Frameworks/RSCore/RSCore/AppKit/UserApp.swift +++ b/Frameworks/RSCore/RSCore/AppKit/UserApp.swift @@ -6,7 +6,7 @@ // Copyright © 2018 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit // Represents an app (the type of app mostly found in /Applications.) // The app may or may not be running. It may or may not exist. diff --git a/Frameworks/RSCore/RSCore/AppKit/WebViewWindowController.swift b/Frameworks/RSCore/RSCore/AppKit/WebViewWindowController.swift index fde7250e4..9d70a0030 100644 --- a/Frameworks/RSCore/RSCore/AppKit/WebViewWindowController.swift +++ b/Frameworks/RSCore/RSCore/AppKit/WebViewWindowController.swift @@ -6,7 +6,7 @@ // Copyright © 2017 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit import WebKit public final class WebViewWindowController: NSWindowController { diff --git a/Frameworks/RSCore/RSCore/Images/NSImage+RSCore.swift b/Frameworks/RSCore/RSCore/Images/NSImage+RSCore.swift index 4b24f6dbc..d537975c2 100644 --- a/Frameworks/RSCore/RSCore/Images/NSImage+RSCore.swift +++ b/Frameworks/RSCore/RSCore/Images/NSImage+RSCore.swift @@ -6,7 +6,7 @@ // Copyright © 2017 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit public extension NSImage { diff --git a/Frameworks/RSCore/RSCore/Keyboard.swift b/Frameworks/RSCore/RSCore/Keyboard.swift index 81b64b114..2eb5c57ef 100644 --- a/Frameworks/RSCore/RSCore/Keyboard.swift +++ b/Frameworks/RSCore/RSCore/Keyboard.swift @@ -6,7 +6,7 @@ // Copyright © 2017 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit // To get, for instance, the keyboard integer value for "\r": "\r".keyboardIntegerValue (returns 13) diff --git a/Frameworks/RSCore/RSCore/NSCalendar+RSCore.m b/Frameworks/RSCore/RSCore/NSCalendar+RSCore.m index 400e6066c..7c76bb8d0 100755 --- a/Frameworks/RSCore/RSCore/NSCalendar+RSCore.m +++ b/Frameworks/RSCore/RSCore/NSCalendar+RSCore.m @@ -11,7 +11,7 @@ #if TARGET_OS_IPHONE @import UIKit; #else -@import Cocoa; +@import AppKit; #endif @implementation NSCalendar (RSCore) diff --git a/Frameworks/RSCore/RSCore/NSColor+RSCore.h b/Frameworks/RSCore/RSCore/NSColor+RSCore.h index b342e2ec4..35493c9bc 100755 --- a/Frameworks/RSCore/RSCore/NSColor+RSCore.h +++ b/Frameworks/RSCore/RSCore/NSColor+RSCore.h @@ -6,7 +6,7 @@ // Copyright (c) 2015 Ranchero Software, LLC. All rights reserved. // -@import Cocoa; +@import AppKit; @interface NSColor (RSCore) diff --git a/Frameworks/RSCore/RSCore/NSImage+RSCore.h b/Frameworks/RSCore/RSCore/NSImage+RSCore.h index ce4d7d2e1..3d6d3957b 100755 --- a/Frameworks/RSCore/RSCore/NSImage+RSCore.h +++ b/Frameworks/RSCore/RSCore/NSImage+RSCore.h @@ -6,7 +6,7 @@ // Copyright (c) 2015 Ranchero Software, LLC. All rights reserved. // -@import Cocoa; +@import AppKit; #import "RSBlocks.h" diff --git a/Frameworks/RSCore/RSCore/NSOutlineView+Extensions.swift b/Frameworks/RSCore/RSCore/NSOutlineView+Extensions.swift index 3150606fc..4590e702f 100755 --- a/Frameworks/RSCore/RSCore/NSOutlineView+Extensions.swift +++ b/Frameworks/RSCore/RSCore/NSOutlineView+Extensions.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit public extension NSOutlineView { diff --git a/Frameworks/RSCore/RSCore/NSResponder-Extensions.swift b/Frameworks/RSCore/RSCore/NSResponder-Extensions.swift index 5a8516c00..199f98b25 100755 --- a/Frameworks/RSCore/RSCore/NSResponder-Extensions.swift +++ b/Frameworks/RSCore/RSCore/NSResponder-Extensions.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit public extension NSResponder { diff --git a/Frameworks/RSCore/RSCore/NSStoryboard+RSCore.h b/Frameworks/RSCore/RSCore/NSStoryboard+RSCore.h index 9bce9166c..2aa4c64de 100755 --- a/Frameworks/RSCore/RSCore/NSStoryboard+RSCore.h +++ b/Frameworks/RSCore/RSCore/NSStoryboard+RSCore.h @@ -6,7 +6,7 @@ // Copyright © 2015 Ranchero Software, LLC. All rights reserved. // -@import Cocoa; +@import AppKit; @interface NSStoryboard (RSCore) diff --git a/Frameworks/RSCore/RSCore/NSTableView+Extensions.swift b/Frameworks/RSCore/RSCore/NSTableView+Extensions.swift index dd79b419f..61eb4c3b6 100755 --- a/Frameworks/RSCore/RSCore/NSTableView+Extensions.swift +++ b/Frameworks/RSCore/RSCore/NSTableView+Extensions.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit public extension NSTableView { diff --git a/Frameworks/RSCore/RSCore/NSTableView+RSCore.h b/Frameworks/RSCore/RSCore/NSTableView+RSCore.h index 81c9af1c6..aacc03df8 100755 --- a/Frameworks/RSCore/RSCore/NSTableView+RSCore.h +++ b/Frameworks/RSCore/RSCore/NSTableView+RSCore.h @@ -6,7 +6,7 @@ // Copyright (c) 2015 Ranchero Software, LLC. All rights reserved. // -@import Cocoa; +@import AppKit; @interface NSTableView (RSCore) diff --git a/Frameworks/RSCore/RSCore/NSView+RSCore.h b/Frameworks/RSCore/RSCore/NSView+RSCore.h index 953aedd77..8545f561d 100755 --- a/Frameworks/RSCore/RSCore/NSView+RSCore.h +++ b/Frameworks/RSCore/RSCore/NSView+RSCore.h @@ -6,7 +6,7 @@ // Copyright (c) 2015 Ranchero Software, LLC. All rights reserved. // -@import Cocoa; +@import AppKit; @interface NSView (RSCore) diff --git a/Frameworks/RSCore/RSCore/NSWindow-Extensions.swift b/Frameworks/RSCore/RSCore/NSWindow-Extensions.swift index 2a5dc898f..0b878fc7f 100755 --- a/Frameworks/RSCore/RSCore/NSWindow-Extensions.swift +++ b/Frameworks/RSCore/RSCore/NSWindow-Extensions.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit public extension NSWindow { diff --git a/Frameworks/RSCore/RSCore/RSBackgroundColorView.h b/Frameworks/RSCore/RSCore/RSBackgroundColorView.h index bd1a4cc74..5be19f0ea 100755 --- a/Frameworks/RSCore/RSCore/RSBackgroundColorView.h +++ b/Frameworks/RSCore/RSCore/RSBackgroundColorView.h @@ -6,7 +6,7 @@ // Copyright (c) 2015 Ranchero Software, LLC. All rights reserved. // -@import Cocoa; +@import AppKit; IB_DESIGNABLE diff --git a/Frameworks/RSCore/RSCore/RSOpaqueContainerView.h b/Frameworks/RSCore/RSCore/RSOpaqueContainerView.h index eaaf51972..0c892c749 100755 --- a/Frameworks/RSCore/RSCore/RSOpaqueContainerView.h +++ b/Frameworks/RSCore/RSCore/RSOpaqueContainerView.h @@ -6,7 +6,7 @@ // Copyright (c) 2015 Ranchero Software, LLC. All rights reserved. // -@import Cocoa; +@import AppKit; #import diff --git a/Frameworks/RSCore/RSCore/RSToolbarItem.swift b/Frameworks/RSCore/RSCore/RSToolbarItem.swift index d9c866db7..205acbf60 100755 --- a/Frameworks/RSCore/RSCore/RSToolbarItem.swift +++ b/Frameworks/RSCore/RSCore/RSToolbarItem.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit public class RSToolbarItem: NSToolbarItem { diff --git a/Frameworks/RSCore/RSCore/RSTransparentContainerView.h b/Frameworks/RSCore/RSCore/RSTransparentContainerView.h index 98e5f0ff8..2dd194d09 100755 --- a/Frameworks/RSCore/RSCore/RSTransparentContainerView.h +++ b/Frameworks/RSCore/RSCore/RSTransparentContainerView.h @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -@import Cocoa; +@import AppKit; /*This view has one subview, which it resizes to fit the bounds of this view.*/ diff --git a/Frameworks/RSCore/RSCoreTests/RSCoreTests.m b/Frameworks/RSCore/RSCoreTests/RSCoreTests.m index 4d2e193e1..c6fd2aa49 100755 --- a/Frameworks/RSCore/RSCoreTests/RSCoreTests.m +++ b/Frameworks/RSCore/RSCoreTests/RSCoreTests.m @@ -6,7 +6,7 @@ // Copyright (c) 2015 Ranchero Software, LLC. All rights reserved. // -#import +#import #import @interface RSCoreTests : XCTestCase diff --git a/Frameworks/RSFeedFinder/RSFeedFinder/RSFeedFinder.h b/Frameworks/RSFeedFinder/RSFeedFinder/RSFeedFinder.h index aca2c158d..bea1e4af0 100644 --- a/Frameworks/RSFeedFinder/RSFeedFinder/RSFeedFinder.h +++ b/Frameworks/RSFeedFinder/RSFeedFinder/RSFeedFinder.h @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -#import +#import //! Project version number for RSFeedFinder. FOUNDATION_EXPORT double RSFeedFinderVersionNumber; diff --git a/Frameworks/RSTextDrawing/RSTextDrawing/RSMultiLineRenderer.h b/Frameworks/RSTextDrawing/RSTextDrawing/RSMultiLineRenderer.h index b409e329e..83f01d8db 100644 --- a/Frameworks/RSTextDrawing/RSTextDrawing/RSMultiLineRenderer.h +++ b/Frameworks/RSTextDrawing/RSTextDrawing/RSMultiLineRenderer.h @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -@import Cocoa; +@import AppKit; #import NS_ASSUME_NONNULL_BEGIN diff --git a/Frameworks/RSTextDrawing/RSTextDrawing/RSMultiLineView.h b/Frameworks/RSTextDrawing/RSTextDrawing/RSMultiLineView.h index 244de3392..8a1a39996 100644 --- a/Frameworks/RSTextDrawing/RSTextDrawing/RSMultiLineView.h +++ b/Frameworks/RSTextDrawing/RSTextDrawing/RSMultiLineView.h @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -@import Cocoa; +@import AppKit; NS_ASSUME_NONNULL_BEGIN diff --git a/Frameworks/RSTextDrawing/RSTextDrawing/RSSingleLineRenderer.h b/Frameworks/RSTextDrawing/RSTextDrawing/RSSingleLineRenderer.h index 1cb26611a..323d64d9a 100644 --- a/Frameworks/RSTextDrawing/RSTextDrawing/RSSingleLineRenderer.h +++ b/Frameworks/RSTextDrawing/RSTextDrawing/RSSingleLineRenderer.h @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -@import Cocoa; +@import AppKit; #import NS_ASSUME_NONNULL_BEGIN diff --git a/Frameworks/RSTextDrawing/RSTextDrawing/RSSingleLineView.h b/Frameworks/RSTextDrawing/RSTextDrawing/RSSingleLineView.h index 49a156f27..18b468fc3 100644 --- a/Frameworks/RSTextDrawing/RSTextDrawing/RSSingleLineView.h +++ b/Frameworks/RSTextDrawing/RSTextDrawing/RSSingleLineView.h @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -@import Cocoa; +@import AppKit; NS_ASSUME_NONNULL_BEGIN diff --git a/Frameworks/RSTextDrawing/RSTextDrawing/RSTextDrawing.h b/Frameworks/RSTextDrawing/RSTextDrawing/RSTextDrawing.h index 76e4d80d6..3b32fae67 100644 --- a/Frameworks/RSTextDrawing/RSTextDrawing/RSTextDrawing.h +++ b/Frameworks/RSTextDrawing/RSTextDrawing/RSTextDrawing.h @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -@import Cocoa; +@import AppKit; #import #import diff --git a/Frameworks/RSTextDrawing/RSTextDrawing/RSTextRendererProtocol.h b/Frameworks/RSTextDrawing/RSTextDrawing/RSTextRendererProtocol.h index e5dab0582..2b3d66246 100644 --- a/Frameworks/RSTextDrawing/RSTextDrawing/RSTextRendererProtocol.h +++ b/Frameworks/RSTextDrawing/RSTextDrawing/RSTextRendererProtocol.h @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -@import Cocoa; +@import AppKit; @protocol RSTextRenderer diff --git a/Frameworks/RSTree/RSTree/NSOutlineView+RSTree.swift b/Frameworks/RSTree/RSTree/NSOutlineView+RSTree.swift index 0ac4c64b9..522e30716 100644 --- a/Frameworks/RSTree/RSTree/NSOutlineView+RSTree.swift +++ b/Frameworks/RSTree/RSTree/NSOutlineView+RSTree.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit public extension NSOutlineView { diff --git a/Frameworks/RSTree/RSTree/RSTree.h b/Frameworks/RSTree/RSTree/RSTree.h index c49255a53..ac696986b 100644 --- a/Frameworks/RSTree/RSTree/RSTree.h +++ b/Frameworks/RSTree/RSTree/RSTree.h @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -#import +#import //! Project version number for RSTree. FOUNDATION_EXPORT double RSTreeVersionNumber; diff --git a/Frameworks/RSWeb/RSWeb/MacWebBrowser.swift b/Frameworks/RSWeb/RSWeb/MacWebBrowser.swift index e061f4117..092e021d1 100755 --- a/Frameworks/RSWeb/RSWeb/MacWebBrowser.swift +++ b/Frameworks/RSWeb/RSWeb/MacWebBrowser.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Ranchero Software, LLC. All rights reserved. // -import Cocoa +import AppKit public class MacWebBrowser {