Fix deprecation warnings for Xcode 12.2

This commit is contained in:
Maurice Parker 2020-10-25 12:34:02 -05:00
parent cba900d4e4
commit b0fc1eccca

View File

@ -1107,10 +1107,10 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
self.treeControllerDelegate.addFilterException(parentFolderFeedID) self.treeControllerDelegate.addFilterException(parentFolderFeedID)
} }
rebuildBackingStores() { rebuildBackingStores(completion: {
self.treeControllerDelegate.resetFilterExceptions() self.treeControllerDelegate.resetFilterExceptions()
self.selectFeed(webFeed, animations: animations, completion: completion) self.selectFeed(webFeed, animations: animations, completion: completion)
} })
} }
@ -1398,10 +1398,10 @@ private extension SceneCoordinator {
addToFilterExeptionsIfNecessary(feed) addToFilterExeptionsIfNecessary(feed)
addShadowTableToFilterExceptions() addShadowTableToFilterExceptions()
rebuildBackingStores() { rebuildBackingStores(completion: {
self.treeControllerDelegate.resetFilterExceptions() self.treeControllerDelegate.resetFilterExceptions()
completion() completion()
} })
} }
func addToFilterExeptionsIfNecessary(_ feed: Feed?) { func addToFilterExeptionsIfNecessary(_ feed: Feed?) {
@ -2134,14 +2134,14 @@ private extension SceneCoordinator {
guard let smartFeed = SmartFeedsController.shared.find(by: feedIdentifier) else { return } guard let smartFeed = SmartFeedsController.shared.find(by: feedIdentifier) else { return }
markExpanded(SmartFeedsController.shared) markExpanded(SmartFeedsController.shared)
rebuildBackingStores() { rebuildBackingStores(completion: {
self.treeControllerDelegate.resetFilterExceptions() self.treeControllerDelegate.resetFilterExceptions()
if let indexPath = self.indexPathFor(smartFeed) { if let indexPath = self.indexPathFor(smartFeed) {
self.selectFeed(indexPath: indexPath) { self.selectFeed(indexPath: indexPath) {
self.masterFeedViewController.focus() self.masterFeedViewController.focus()
} }
} }
} })
case .script: case .script:
break break
@ -2154,7 +2154,7 @@ private extension SceneCoordinator {
markExpanded(account) markExpanded(account)
rebuildBackingStores() { rebuildBackingStores(completion: {
self.treeControllerDelegate.resetFilterExceptions() self.treeControllerDelegate.resetFilterExceptions()
if let folderNode = self.findFolderNode(folderName: folderName, beginningAt: accountNode), let indexPath = self.indexPathFor(folderNode) { if let folderNode = self.findFolderNode(folderName: folderName, beginningAt: accountNode), let indexPath = self.indexPathFor(folderNode) {
@ -2162,7 +2162,7 @@ private extension SceneCoordinator {
self.masterFeedViewController.focus() self.masterFeedViewController.focus()
} }
} }
} })
case .webFeed(let accountID, let webFeedID): case .webFeed(let accountID, let webFeedID):
guard let accountNode = findAccountNode(accountID: accountID), guard let accountNode = findAccountNode(accountID: accountID),