From f495730066ca450a532b3216af6c0051ba1f82fd Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Wed, 5 Apr 2023 19:04:52 -0700
Subject: [PATCH] Continue adopting @MainActor.

---
 Mac/MainWindow/AddFeed/AddWebFeedWindowController.swift        | 2 +-
 Mac/MainWindow/AddFeed/FolderTreeMenu.swift                    | 2 +-
 Mac/MainWindow/AddFolder/AddFolderWindowController.swift       | 2 +-
 Mac/MainWindow/NNW3/NNW3ImportController.swift                 | 2 +-
 Mac/MainWindow/NNW3/NNW3OpenPanelAccessoryViewController.swift | 2 +-
 Mac/MainWindow/OPML/ExportOPMLWindowController.swift           | 2 +-
 Mac/MainWindow/OPML/ImportOPMLWindowController.swift           | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Mac/MainWindow/AddFeed/AddWebFeedWindowController.swift b/Mac/MainWindow/AddFeed/AddWebFeedWindowController.swift
index 16c8a4d72..40b6f6301 100644
--- a/Mac/MainWindow/AddFeed/AddWebFeedWindowController.swift
+++ b/Mac/MainWindow/AddFeed/AddWebFeedWindowController.swift
@@ -12,7 +12,7 @@ import RSTree
 import Articles
 import Account
 
-class AddWebFeedWindowController : NSWindowController, AddFeedWindowController {
+@MainActor final class AddWebFeedWindowController : NSWindowController, AddFeedWindowController {
     
     @IBOutlet var urlTextField: NSTextField!
 	@IBOutlet var nameTextField: NSTextField!
diff --git a/Mac/MainWindow/AddFeed/FolderTreeMenu.swift b/Mac/MainWindow/AddFeed/FolderTreeMenu.swift
index 87250dd6b..1c696f0dc 100644
--- a/Mac/MainWindow/AddFeed/FolderTreeMenu.swift
+++ b/Mac/MainWindow/AddFeed/FolderTreeMenu.swift
@@ -11,7 +11,7 @@ import RSCore
 import RSTree
 import Account
 
-class FolderTreeMenu {
+@MainActor final class FolderTreeMenu {
 
 	static func createFolderPopupMenu(with rootNode: Node, restrictToSpecialAccounts: Bool = false) -> NSMenu {
 		
diff --git a/Mac/MainWindow/AddFolder/AddFolderWindowController.swift b/Mac/MainWindow/AddFolder/AddFolderWindowController.swift
index 84053ee20..08cc50310 100644
--- a/Mac/MainWindow/AddFolder/AddFolderWindowController.swift
+++ b/Mac/MainWindow/AddFolder/AddFolderWindowController.swift
@@ -10,7 +10,7 @@ import AppKit
 import Articles
 import Account
 
-class AddFolderWindowController : NSWindowController {
+@MainActor final class AddFolderWindowController : NSWindowController {
     
     @IBOutlet var folderNameTextField: NSTextField!
     @IBOutlet var accountPopupButton: NSPopUpButton!
diff --git a/Mac/MainWindow/NNW3/NNW3ImportController.swift b/Mac/MainWindow/NNW3/NNW3ImportController.swift
index 32084490e..b36c1e7ee 100644
--- a/Mac/MainWindow/NNW3/NNW3ImportController.swift
+++ b/Mac/MainWindow/NNW3/NNW3ImportController.swift
@@ -9,7 +9,7 @@
 import AppKit
 import Account
 
-struct NNW3ImportController {
+@MainActor struct NNW3ImportController {
 
 	/// Import NNW3 subscriptions if they exist.
 	/// Return true if Subscriptions.plist was found and subscriptions were imported.
diff --git a/Mac/MainWindow/NNW3/NNW3OpenPanelAccessoryViewController.swift b/Mac/MainWindow/NNW3/NNW3OpenPanelAccessoryViewController.swift
index 110377b11..a8c2484c2 100644
--- a/Mac/MainWindow/NNW3/NNW3OpenPanelAccessoryViewController.swift
+++ b/Mac/MainWindow/NNW3/NNW3OpenPanelAccessoryViewController.swift
@@ -9,7 +9,7 @@
 import AppKit
 import Account
 
-final class NNW3OpenPanelAccessoryViewController: NSViewController {
+@MainActor final class NNW3OpenPanelAccessoryViewController: NSViewController {
 
 	@IBOutlet weak var accountPopUpButton: NSPopUpButton!
 
diff --git a/Mac/MainWindow/OPML/ExportOPMLWindowController.swift b/Mac/MainWindow/OPML/ExportOPMLWindowController.swift
index 4b2ce20a6..0ff8284e0 100644
--- a/Mac/MainWindow/OPML/ExportOPMLWindowController.swift
+++ b/Mac/MainWindow/OPML/ExportOPMLWindowController.swift
@@ -9,7 +9,7 @@
 import AppKit
 import Account
 
-class ExportOPMLWindowController: NSWindowController {
+@MainActor final class ExportOPMLWindowController: NSWindowController {
 
 	@IBOutlet weak var accountPopUpButton: NSPopUpButton!
 	private weak var hostWindow: NSWindow?
diff --git a/Mac/MainWindow/OPML/ImportOPMLWindowController.swift b/Mac/MainWindow/OPML/ImportOPMLWindowController.swift
index f0737fe93..3a53c3de3 100644
--- a/Mac/MainWindow/OPML/ImportOPMLWindowController.swift
+++ b/Mac/MainWindow/OPML/ImportOPMLWindowController.swift
@@ -9,7 +9,7 @@
 import AppKit
 import Account
 
-class ImportOPMLWindowController: NSWindowController {
+@MainActor final class ImportOPMLWindowController: NSWindowController {
 
 	@IBOutlet weak var accountPopUpButton: NSPopUpButton!
 	private weak var hostWindow: NSWindow?