From cc218dfbcb4a83345eb39571c8a08badeb2356f1 Mon Sep 17 00:00:00 2001 From: relikd Date: Mon, 12 Aug 2019 00:25:13 +0200 Subject: [PATCH] @import --- baRSS/AppHook.h | 4 +--- baRSS/Constants.h | 2 ++ baRSS/Core Data/Feed+Ext.h | 3 +-- baRSS/Core Data/Feed+Ext.m | 3 +-- baRSS/Core Data/FeedArticle+Ext.h | 3 +-- baRSS/Core Data/FeedArticle+Ext.m | 3 +-- baRSS/Core Data/FeedGroup+Ext.h | 2 +- baRSS/Core Data/FeedMeta+Ext.h | 1 + baRSS/Core Data/NSFetchRequest+Ext.h | 2 +- baRSS/Core Data/StoreCoordinator.h | 2 +- baRSS/Feed Import/OpmlFile.h | 4 +--- baRSS/Feed Import/OpmlFile.m | 3 +-- baRSS/Feed Import/UpdateScheduler.h | 2 +- baRSS/Feed Import/UpdateScheduler.m | 3 +-- baRSS/Feed Import/WebFeed.h | 5 ++--- baRSS/Helper/DrawImage.h | 2 +- baRSS/Helper/NSDate+Ext.h | 2 +- baRSS/Helper/NSDate+Ext.m | 3 +-- baRSS/Helper/NSView+Ext.h | 2 +- baRSS/Info.plist | 2 +- baRSS/Preferences/About Tab/SettingsAbout.h | 2 +- baRSS/Preferences/About Tab/SettingsAboutView.h | 2 +- baRSS/Preferences/Appearance Tab/SettingsAppearance.h | 2 +- baRSS/Preferences/Appearance Tab/SettingsAppearance.m | 1 - baRSS/Preferences/Appearance Tab/SettingsAppearanceView.h | 3 +-- baRSS/Preferences/Feeds Tab/ModalFeedEdit.h | 5 ++--- baRSS/Preferences/Feeds Tab/ModalFeedEditView.h | 3 +-- baRSS/Preferences/Feeds Tab/RefreshStatisticsView.h | 2 +- baRSS/Preferences/Feeds Tab/SettingsFeeds.h | 2 +- baRSS/Preferences/Feeds Tab/SettingsFeedsView.h | 3 +-- baRSS/Preferences/Feeds Tab/SettingsFeedsView.m | 1 - baRSS/Preferences/General Tab/SettingsGeneral.h | 2 +- baRSS/Preferences/General Tab/SettingsGeneralView.h | 3 +-- baRSS/Preferences/Helper/ModalSheet.h | 2 +- baRSS/Preferences/Helper/UserPrefs.h | 2 +- baRSS/Preferences/Helper/UserPrefs.m | 2 -- baRSS/Preferences/Preferences.h | 3 +-- baRSS/Status Bar Menu/BarMenu.h | 3 +-- baRSS/Status Bar Menu/BarStatusItem.h | 2 +- baRSS/Status Bar Menu/MapUnreadTotal.h | 2 +- baRSS/Status Bar Menu/NSMenu+Ext.h | 3 +-- baRSS/main.m | 1 - 42 files changed, 41 insertions(+), 63 deletions(-) diff --git a/baRSS/AppHook.h b/baRSS/AppHook.h index 3ccf731..0052ef4 100644 --- a/baRSS/AppHook.h +++ b/baRSS/AppHook.h @@ -20,9 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import -#import - +@import Cocoa; @class BarStatusItem; @interface AppHook : NSApplication diff --git a/baRSS/Constants.h b/baRSS/Constants.h index b64ed82..0476a57 100644 --- a/baRSS/Constants.h +++ b/baRSS/Constants.h @@ -23,6 +23,8 @@ #ifndef Constants_h #define Constants_h +@import Cocoa; + // TODO: Add support for media player? image feed? // // TODO: Disable 'update all' menu item during update? diff --git a/baRSS/Core Data/Feed+Ext.h b/baRSS/Core Data/Feed+Ext.h index ce55384..4f2c618 100644 --- a/baRSS/Core Data/Feed+Ext.h +++ b/baRSS/Core Data/Feed+Ext.h @@ -20,9 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +@import Cocoa; #import "Feed+CoreDataClass.h" -#import - @class RSParsedFeed; @interface Feed (Ext) diff --git a/baRSS/Core Data/Feed+Ext.m b/baRSS/Core Data/Feed+Ext.m index 7c136f2..cd4853b 100644 --- a/baRSS/Core Data/Feed+Ext.m +++ b/baRSS/Core Data/Feed+Ext.m @@ -20,6 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +@import RSXML; #import "Feed+Ext.h" #import "Constants.h" #import "UserPrefs.h" @@ -28,8 +29,6 @@ #import "FeedArticle+Ext.h" #import "StoreCoordinator.h" -#import - @implementation Feed (Ext) /// Instantiates new @c Feed and @c FeedMeta entities in context. diff --git a/baRSS/Core Data/FeedArticle+Ext.h b/baRSS/Core Data/FeedArticle+Ext.h index d6f7b13..115cd28 100644 --- a/baRSS/Core Data/FeedArticle+Ext.h +++ b/baRSS/Core Data/FeedArticle+Ext.h @@ -20,9 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +@import Cocoa; #import "FeedArticle+CoreDataClass.h" -#import - @class RSParsedArticle; @interface FeedArticle (Ext) diff --git a/baRSS/Core Data/FeedArticle+Ext.m b/baRSS/Core Data/FeedArticle+Ext.m index c7fe946..b77823e 100644 --- a/baRSS/Core Data/FeedArticle+Ext.m +++ b/baRSS/Core Data/FeedArticle+Ext.m @@ -20,13 +20,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +@import RSXML.RSParsedArticle; #import "FeedArticle+Ext.h" #import "Constants.h" #import "UserPrefs.h" #import "StoreCoordinator.h" -#import - @implementation FeedArticle (Ext) /// Create new article based on RSXML article input. diff --git a/baRSS/Core Data/FeedGroup+Ext.h b/baRSS/Core Data/FeedGroup+Ext.h index 509f432..cea8e22 100644 --- a/baRSS/Core Data/FeedGroup+Ext.h +++ b/baRSS/Core Data/FeedGroup+Ext.h @@ -20,8 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +@import Cocoa; #import "FeedGroup+CoreDataClass.h" -#import /// Enum type to distinguish different @c FeedGroup types: @c GROUP, @c FEED, @c SEPARATOR typedef NS_ENUM(int16_t, FeedGroupType) { diff --git a/baRSS/Core Data/FeedMeta+Ext.h b/baRSS/Core Data/FeedMeta+Ext.h index 460c8a4..411f56f 100644 --- a/baRSS/Core Data/FeedMeta+Ext.h +++ b/baRSS/Core Data/FeedMeta+Ext.h @@ -20,6 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +@import Cocoa; #import "FeedMeta+CoreDataClass.h" static int32_t const kDefaultFeedRefreshInterval = 30 * 60; diff --git a/baRSS/Core Data/NSFetchRequest+Ext.h b/baRSS/Core Data/NSFetchRequest+Ext.h index 6d30825..7567006 100644 --- a/baRSS/Core Data/NSFetchRequest+Ext.h +++ b/baRSS/Core Data/NSFetchRequest+Ext.h @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import +@import Cocoa; @interface NSFetchRequest (Ext) // Perform core data request and fetch data diff --git a/baRSS/Core Data/StoreCoordinator.h b/baRSS/Core Data/StoreCoordinator.h index e12f127..796ccad 100644 --- a/baRSS/Core Data/StoreCoordinator.h +++ b/baRSS/Core Data/StoreCoordinator.h @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import +@import Cocoa; #import "DBv1+CoreDataModel.h" static int const dbFileVersion = 1; // update in case database structure changes diff --git a/baRSS/Feed Import/OpmlFile.h b/baRSS/Feed Import/OpmlFile.h index ff6dfe8..de26975 100644 --- a/baRSS/Feed Import/OpmlFile.h +++ b/baRSS/Feed Import/OpmlFile.h @@ -20,9 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import -#import - +@import Cocoa; @class FeedGroup; typedef NS_OPTIONS(NSUInteger, OpmlFileExportOptions) { diff --git a/baRSS/Feed Import/OpmlFile.m b/baRSS/Feed Import/OpmlFile.m index 8754c0d..3c04146 100644 --- a/baRSS/Feed Import/OpmlFile.m +++ b/baRSS/Feed Import/OpmlFile.m @@ -20,6 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +@import RSXML; #import "OpmlFile.h" #import "FeedMeta+Ext.h" #import "FeedGroup+Ext.h" @@ -28,8 +29,6 @@ #import "NSDate+Ext.h" #import "NSView+Ext.h" -#import - #pragma mark - Helper /// Loop over all subviews and find the @c NSButton that is selected. diff --git a/baRSS/Feed Import/UpdateScheduler.h b/baRSS/Feed Import/UpdateScheduler.h index fd12c38..202df93 100644 --- a/baRSS/Feed Import/UpdateScheduler.h +++ b/baRSS/Feed Import/UpdateScheduler.h @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import +@import Cocoa; @interface UpdateScheduler : NSObject @property (class, readonly) NSDate *dateScheduled; diff --git a/baRSS/Feed Import/UpdateScheduler.m b/baRSS/Feed Import/UpdateScheduler.m index 7c5a285..7154e9a 100644 --- a/baRSS/Feed Import/UpdateScheduler.m +++ b/baRSS/Feed Import/UpdateScheduler.m @@ -20,13 +20,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +@import SystemConfiguration; #import "UpdateScheduler.h" #import "WebFeed.h" #import "Constants.h" #import "StoreCoordinator.h" -#import - static NSTimer *_timer; static SCNetworkReachabilityRef _reachability = NULL; static BOOL _isReachable = NO; diff --git a/baRSS/Feed Import/WebFeed.h b/baRSS/Feed Import/WebFeed.h index 8540bb6..a9ee7a9 100644 --- a/baRSS/Feed Import/WebFeed.h +++ b/baRSS/Feed Import/WebFeed.h @@ -20,9 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import -#import - +@import Cocoa; +@import RSXML; @class Feed; @interface WebFeed : NSObject diff --git a/baRSS/Helper/DrawImage.h b/baRSS/Helper/DrawImage.h index 4d06572..1585e14 100644 --- a/baRSS/Helper/DrawImage.h +++ b/baRSS/Helper/DrawImage.h @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import +@import Cocoa; @interface NSColor (RandomColor) /// just for testing purposes diff --git a/baRSS/Helper/NSDate+Ext.h b/baRSS/Helper/NSDate+Ext.h index 498da6a..0fb3853 100644 --- a/baRSS/Helper/NSDate+Ext.h +++ b/baRSS/Helper/NSDate+Ext.h @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import +@import Cocoa; typedef int32_t Interval; typedef NS_ENUM(int32_t, TimeUnitType) { diff --git a/baRSS/Helper/NSDate+Ext.m b/baRSS/Helper/NSDate+Ext.m index e401715..4451bd4 100644 --- a/baRSS/Helper/NSDate+Ext.m +++ b/baRSS/Helper/NSDate+Ext.m @@ -20,10 +20,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +@import QuartzCore; #import "NSDate+Ext.h" -#import - static TimeUnitType const _values[] = { TimeUnitYears, TimeUnitWeeks, diff --git a/baRSS/Helper/NSView+Ext.h b/baRSS/Helper/NSView+Ext.h index d3d81fd..3909fa5 100644 --- a/baRSS/Helper/NSView+Ext.h +++ b/baRSS/Helper/NSView+Ext.h @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import +@import Cocoa; /***/ static CGFloat const PAD_WIN = 20; // window padding /***/ static CGFloat const PAD_L = 16; diff --git a/baRSS/Info.plist b/baRSS/Info.plist index 3116f85..7fadbbd 100644 --- a/baRSS/Info.plist +++ b/baRSS/Info.plist @@ -60,7 +60,7 @@ CFBundleVersion - 10198 + 10349 LSApplicationCategoryType public.app-category.news LSMinimumSystemVersion diff --git a/baRSS/Preferences/About Tab/SettingsAbout.h b/baRSS/Preferences/About Tab/SettingsAbout.h index 40c2532..9e5bd50 100644 --- a/baRSS/Preferences/About Tab/SettingsAbout.h +++ b/baRSS/Preferences/About Tab/SettingsAbout.h @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import +@import Cocoa; @interface SettingsAbout : NSViewController @end diff --git a/baRSS/Preferences/About Tab/SettingsAboutView.h b/baRSS/Preferences/About Tab/SettingsAboutView.h index da11dac..484ffd5 100644 --- a/baRSS/Preferences/About Tab/SettingsAboutView.h +++ b/baRSS/Preferences/About Tab/SettingsAboutView.h @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import +@import Cocoa; @interface SettingsAboutView : NSView @end diff --git a/baRSS/Preferences/Appearance Tab/SettingsAppearance.h b/baRSS/Preferences/Appearance Tab/SettingsAppearance.h index 8c516f8..067202a 100644 --- a/baRSS/Preferences/Appearance Tab/SettingsAppearance.h +++ b/baRSS/Preferences/Appearance Tab/SettingsAppearance.h @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import +@import Cocoa; @interface SettingsAppearance : NSViewController - (void)didSelectCheckbox:(NSButton*)sender; diff --git a/baRSS/Preferences/Appearance Tab/SettingsAppearance.m b/baRSS/Preferences/Appearance Tab/SettingsAppearance.m index c67da71..cc6315e 100644 --- a/baRSS/Preferences/Appearance Tab/SettingsAppearance.m +++ b/baRSS/Preferences/Appearance Tab/SettingsAppearance.m @@ -25,7 +25,6 @@ #import "AppHook.h" #import "BarStatusItem.h" - @implementation SettingsAppearance - (void)loadView { diff --git a/baRSS/Preferences/Appearance Tab/SettingsAppearanceView.h b/baRSS/Preferences/Appearance Tab/SettingsAppearanceView.h index 046e2b5..ee14334 100644 --- a/baRSS/Preferences/Appearance Tab/SettingsAppearanceView.h +++ b/baRSS/Preferences/Appearance Tab/SettingsAppearanceView.h @@ -20,8 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import - +@import Cocoa; @class SettingsAppearance; @interface SettingsAppearanceView : NSView diff --git a/baRSS/Preferences/Feeds Tab/ModalFeedEdit.h b/baRSS/Preferences/Feeds Tab/ModalFeedEdit.h index b78fc04..4f10a9e 100644 --- a/baRSS/Preferences/Feeds Tab/ModalFeedEdit.h +++ b/baRSS/Preferences/Feeds Tab/ModalFeedEdit.h @@ -20,10 +20,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import +@import Cocoa; #import "ModalSheet.h" - -@class FeedGroup; +@class FeedGroup, ModalSheet; @interface ModalEditDialog : NSViewController + (instancetype)modalWith:(FeedGroup*)group; diff --git a/baRSS/Preferences/Feeds Tab/ModalFeedEditView.h b/baRSS/Preferences/Feeds Tab/ModalFeedEditView.h index 29520b4..6895c3c 100644 --- a/baRSS/Preferences/Feeds Tab/ModalFeedEditView.h +++ b/baRSS/Preferences/Feeds Tab/ModalFeedEditView.h @@ -20,8 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import - +@import Cocoa; @class ModalFeedEdit; @interface ModalFeedEditView : NSView diff --git a/baRSS/Preferences/Feeds Tab/RefreshStatisticsView.h b/baRSS/Preferences/Feeds Tab/RefreshStatisticsView.h index c790379..8594dff 100644 --- a/baRSS/Preferences/Feeds Tab/RefreshStatisticsView.h +++ b/baRSS/Preferences/Feeds Tab/RefreshStatisticsView.h @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import +@import Cocoa; @protocol RefreshIntervalButtonDelegate @required diff --git a/baRSS/Preferences/Feeds Tab/SettingsFeeds.h b/baRSS/Preferences/Feeds Tab/SettingsFeeds.h index aefaa96..c3e4983 100644 --- a/baRSS/Preferences/Feeds Tab/SettingsFeeds.h +++ b/baRSS/Preferences/Feeds Tab/SettingsFeeds.h @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import +@import Cocoa; /** Manages the NSOutlineView and Feed creation and editing */ @interface SettingsFeeds : NSViewController diff --git a/baRSS/Preferences/Feeds Tab/SettingsFeedsView.h b/baRSS/Preferences/Feeds Tab/SettingsFeedsView.h index 7e9704e..47b7762 100644 --- a/baRSS/Preferences/Feeds Tab/SettingsFeedsView.h +++ b/baRSS/Preferences/Feeds Tab/SettingsFeedsView.h @@ -20,8 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import - +@import Cocoa; @class SettingsFeeds; @interface SettingsFeedsView : NSView diff --git a/baRSS/Preferences/Feeds Tab/SettingsFeedsView.m b/baRSS/Preferences/Feeds Tab/SettingsFeedsView.m index 20d6363..57dfa01 100644 --- a/baRSS/Preferences/Feeds Tab/SettingsFeedsView.m +++ b/baRSS/Preferences/Feeds Tab/SettingsFeedsView.m @@ -29,7 +29,6 @@ #import "NSDate+Ext.h" #import "NSView+Ext.h" - @interface SettingsFeedsView() @property (weak) SettingsFeeds *controller; @end diff --git a/baRSS/Preferences/General Tab/SettingsGeneral.h b/baRSS/Preferences/General Tab/SettingsGeneral.h index eb000b8..1f40950 100644 --- a/baRSS/Preferences/General Tab/SettingsGeneral.h +++ b/baRSS/Preferences/General Tab/SettingsGeneral.h @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import +@import Cocoa; @interface SettingsGeneral : NSViewController - (void)fixCache:(NSButton *)sender; diff --git a/baRSS/Preferences/General Tab/SettingsGeneralView.h b/baRSS/Preferences/General Tab/SettingsGeneralView.h index cbe438b..13c975b 100644 --- a/baRSS/Preferences/General Tab/SettingsGeneralView.h +++ b/baRSS/Preferences/General Tab/SettingsGeneralView.h @@ -20,8 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import - +@import Cocoa; @class SettingsGeneral; @interface SettingsGeneralView : NSView diff --git a/baRSS/Preferences/Helper/ModalSheet.h b/baRSS/Preferences/Helper/ModalSheet.h index e13f71e..40c7a84 100644 --- a/baRSS/Preferences/Helper/ModalSheet.h +++ b/baRSS/Preferences/Helper/ModalSheet.h @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import +@import Cocoa; @interface ModalSheet : NSPanel @property (readonly) BOOL didCloseAndCancel; diff --git a/baRSS/Preferences/Helper/UserPrefs.h b/baRSS/Preferences/Helper/UserPrefs.h index a885a11..bcf9f10 100644 --- a/baRSS/Preferences/Helper/UserPrefs.h +++ b/baRSS/Preferences/Helper/UserPrefs.h @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import +@import Cocoa; @interface UserPrefs : NSObject // User Preferences Plist diff --git a/baRSS/Preferences/Helper/UserPrefs.m b/baRSS/Preferences/Helper/UserPrefs.m index 1750ce8..602f9b9 100644 --- a/baRSS/Preferences/Helper/UserPrefs.m +++ b/baRSS/Preferences/Helper/UserPrefs.m @@ -23,8 +23,6 @@ #import "UserPrefs.h" #import "StoreCoordinator.h" -#import - @implementation UserPrefs #pragma mark - User Preferences Plist diff --git a/baRSS/Preferences/Preferences.h b/baRSS/Preferences/Preferences.h index 297769d..b5b3374 100644 --- a/baRSS/Preferences/Preferences.h +++ b/baRSS/Preferences/Preferences.h @@ -20,8 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import - +@import Cocoa; @class SettingsFeeds; @interface Preferences : NSWindow diff --git a/baRSS/Status Bar Menu/BarMenu.h b/baRSS/Status Bar Menu/BarMenu.h index 37a583c..459ab44 100644 --- a/baRSS/Status Bar Menu/BarMenu.h +++ b/baRSS/Status Bar Menu/BarMenu.h @@ -20,8 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import - +@import Cocoa; @class BarStatusItem; @interface BarMenu : NSObject diff --git a/baRSS/Status Bar Menu/BarStatusItem.h b/baRSS/Status Bar Menu/BarStatusItem.h index 39b6973..8234619 100644 --- a/baRSS/Status Bar Menu/BarStatusItem.h +++ b/baRSS/Status Bar Menu/BarStatusItem.h @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import +@import Cocoa; @interface BarStatusItem : NSObject @property (weak, readonly) NSMenu *mainMenu; diff --git a/baRSS/Status Bar Menu/MapUnreadTotal.h b/baRSS/Status Bar Menu/MapUnreadTotal.h index 18eeb20..30b10a0 100644 --- a/baRSS/Status Bar Menu/MapUnreadTotal.h +++ b/baRSS/Status Bar Menu/MapUnreadTotal.h @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import +@import Cocoa; @interface UnreadTotal : NSObject @property (nonatomic, assign) NSUInteger unread; diff --git a/baRSS/Status Bar Menu/NSMenu+Ext.h b/baRSS/Status Bar Menu/NSMenu+Ext.h index aecab4b..b90a298 100644 --- a/baRSS/Status Bar Menu/NSMenu+Ext.h +++ b/baRSS/Status Bar Menu/NSMenu+Ext.h @@ -20,8 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import - +@import Cocoa; @class FeedGroup; @interface NSMenu (Ext) diff --git a/baRSS/main.m b/baRSS/main.m index 2639d0c..2b31004 100644 --- a/baRSS/main.m +++ b/baRSS/main.m @@ -20,7 +20,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#import #import "AppHook.h" int main(int argc, const char * argv[]) {