From 3a5741a5dd30b8ea4bbd9adf18285234ef89e068 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Tue, 5 Feb 2019 21:00:10 -0800 Subject: [PATCH] Make exportDictionary and internalDictionary private vars instead of functions in FeedPasteboardWriter. --- .../MainWindow/Sidebar/PasteboardFeed.swift | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/NetNewsWire/MainWindow/Sidebar/PasteboardFeed.swift b/NetNewsWire/MainWindow/Sidebar/PasteboardFeed.swift index 1e8c0b9cb..03cf72a6e 100644 --- a/NetNewsWire/MainWindow/Sidebar/PasteboardFeed.swift +++ b/NetNewsWire/MainWindow/Sidebar/PasteboardFeed.swift @@ -172,9 +172,9 @@ extension Feed: PasteboardWriterOwner { case .URL: plist = feed.url case FeedPasteboardWriter.feedUTIType: - plist = exportDictionary() + plist = exportDictionary case FeedPasteboardWriter.feedUTIInternalType: - plist = internalDictionary() + plist = internalDictionary default: plist = nil } @@ -185,13 +185,15 @@ extension Feed: PasteboardWriterOwner { private extension FeedPasteboardWriter { - func exportDictionary() -> [String: String] { - let pasteboardFeed = PasteboardFeed(url: feed.url, feedID: feed.feedID, homePageURL: feed.homePageURL, name: feed.name, editedName: feed.editedName, accountID: feed.account?.accountID) + var pasteboardFeed: PasteboardFeed { + return PasteboardFeed(url: feed.url, feedID: feed.feedID, homePageURL: feed.homePageURL, name: feed.name, editedName: feed.editedName, accountID: feed.account?.accountID) + } + + var exportDictionary: PasteboardFeedDictionary { return pasteboardFeed.exportDictionary() } - func internalDictionary() -> [String: Any] { - let pasteboardFeed = PasteboardFeed(url: feed.url, feedID: feed.feedID, homePageURL: feed.homePageURL, name: feed.name, editedName: feed.editedName, accountID: feed.account?.accountID) + var internalDictionary: PasteboardFeedDictionary { return pasteboardFeed.internalDictionary() } }