@import

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 <Cocoa/Cocoa.h>
-#import <CoreData/CoreData.h>
-
+@import Cocoa;
 @class BarStatusItem;
 
 @interface AppHook : NSApplication <NSApplicationDelegate>

baRSS/Constants.h

@@ -23,6 +23,8 @@
 #ifndef Constants_h
 #define Constants_h
 
+@import Cocoa;
+
 // TODO: Add support for media player? image feed?
 // <enclosure url="https://url.mp3" length="63274022" type="audio/mpeg" />
 // TODO: Disable 'update all' menu item during update?

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 <Cocoa/Cocoa.h>
-
 @class RSParsedFeed;
 
 @interface Feed (Ext)

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 <RSXML/RSXML.h>
-
 @implementation Feed (Ext)
 
 /// Instantiates new @c Feed and @c FeedMeta entities in context.

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 <Cocoa/Cocoa.h>
-
 @class RSParsedArticle;
 
 @interface FeedArticle (Ext)

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 <RSXML/RSParsedArticle.h>
-
 @implementation FeedArticle (Ext)
 
 /// Create new article based on RSXML article input.

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 <Cocoa/Cocoa.h>
 
 /// Enum type to distinguish different @c FeedGroup types: @c GROUP, @c FEED, @c SEPARATOR
 typedef NS_ENUM(int16_t, FeedGroupType) {

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;

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 <CoreData/CoreData.h>
+@import Cocoa;
 
 @interface NSFetchRequest<ResultType> (Ext)
 // Perform core data request and fetch data

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 <Foundation/Foundation.h>
+@import Cocoa;
 #import "DBv1+CoreDataModel.h"
 
 static int const dbFileVersion = 1; // update in case database structure changes

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 <Foundation/Foundation.h>
-#import <Cocoa/Cocoa.h>
-
+@import Cocoa;
 @class FeedGroup;
 
 typedef NS_OPTIONS(NSUInteger, OpmlFileExportOptions) {

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 <RSXML/RSXML.h>
-
 #pragma mark - Helper
 
 /// Loop over all subviews and find the @c NSButton that is selected.

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 <Cocoa/Cocoa.h>
+@import Cocoa;
 
 @interface UpdateScheduler : NSObject
 @property (class, readonly) NSDate *dateScheduled;

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 <SystemConfiguration/SystemConfiguration.h>
-
 static NSTimer *_timer;
 static SCNetworkReachabilityRef _reachability = NULL;
 static BOOL _isReachable = NO;

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 <Foundation/Foundation.h>
-#import <RSXML/RSXML.h>
-
+@import Cocoa;
+@import RSXML;
 @class Feed;
 
 @interface WebFeed : NSObject

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 <Cocoa/Cocoa.h>
+@import Cocoa;
 
 @interface NSColor (RandomColor)
 /// just for testing purposes

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 <Cocoa/Cocoa.h>
+@import Cocoa;
 
 typedef int32_t Interval;
 typedef NS_ENUM(int32_t, TimeUnitType) {

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 <QuartzCore/QuartzCore.h>
-
 static TimeUnitType const _values[] = {
 	TimeUnitYears,
 	TimeUnitWeeks,

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 <Cocoa/Cocoa.h>
+@import Cocoa;
 
 /***/ static CGFloat const PAD_WIN = 20; // window padding
 /***/ static CGFloat const PAD_L = 16;

baRSS/Info.plist

@@ -60,7 +60,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>10198</string>
+	<string>10349</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.news</string>
 	<key>LSMinimumSystemVersion</key>

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 <Cocoa/Cocoa.h>
+@import Cocoa;
 
 @interface SettingsAbout : NSViewController
 @end

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 <Cocoa/Cocoa.h>
+@import Cocoa;
 
 @interface SettingsAboutView : NSView
 @end

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 <Cocoa/Cocoa.h>
+@import Cocoa;
 
 @interface SettingsAppearance : NSViewController
 - (void)didSelectCheckbox:(NSButton*)sender;

baRSS/Preferences/Appearance Tab/SettingsAppearance.m

@@ -25,7 +25,6 @@
 #import "AppHook.h"
 #import "BarStatusItem.h"
 
-
 @implementation SettingsAppearance
 
 - (void)loadView {

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 <Cocoa/Cocoa.h>
-
+@import Cocoa;
 @class SettingsAppearance;
 
 @interface SettingsAppearanceView : NSView

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 <Cocoa/Cocoa.h>
+@import Cocoa;
 #import "ModalSheet.h"
-
-@class FeedGroup;
+@class FeedGroup, ModalSheet;
 
 @interface ModalEditDialog : NSViewController
 + (instancetype)modalWith:(FeedGroup*)group;

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 <Cocoa/Cocoa.h>
-
+@import Cocoa;
 @class ModalFeedEdit;
 
 @interface ModalFeedEditView : NSView

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 <Cocoa/Cocoa.h>
+@import Cocoa;
 
 @protocol RefreshIntervalButtonDelegate <NSObject>
 @required

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 <Cocoa/Cocoa.h>
+@import Cocoa;
 
 /** Manages the NSOutlineView and Feed creation and editing */
 @interface SettingsFeeds : NSViewController <NSOutlineViewDelegate>

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 <Cocoa/Cocoa.h>
-
+@import Cocoa;
 @class SettingsFeeds;
 
 @interface SettingsFeedsView : NSView

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

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 <Cocoa/Cocoa.h>
+@import Cocoa;
 
 @interface SettingsGeneral : NSViewController
 - (void)fixCache:(NSButton *)sender;

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 <Cocoa/Cocoa.h>
-
+@import Cocoa;
 @class SettingsGeneral;
 
 @interface SettingsGeneralView : NSView

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 <Cocoa/Cocoa.h>
+@import Cocoa;
 
 @interface ModalSheet : NSPanel
 @property (readonly) BOOL didCloseAndCancel;

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 <Foundation/Foundation.h>
+@import Cocoa;
 
 @interface UserPrefs : NSObject
 // User Preferences Plist

baRSS/Preferences/Helper/UserPrefs.m

@@ -23,8 +23,6 @@
 #import "UserPrefs.h"
 #import "StoreCoordinator.h"
 
-#import <Cocoa/Cocoa.h>
-
 @implementation UserPrefs
 
 #pragma mark - User Preferences Plist

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 <Cocoa/Cocoa.h>
-
+@import Cocoa;
 @class SettingsFeeds;
 
 @interface Preferences : NSWindow <NSWindowDelegate>

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 <Cocoa/Cocoa.h>
-
+@import Cocoa;
 @class BarStatusItem;
 
 @interface BarMenu : NSObject <NSMenuDelegate>

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 <Cocoa/Cocoa.h>
+@import Cocoa;
 
 @interface BarStatusItem : NSObject
 @property (weak, readonly) NSMenu *mainMenu;

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 <Foundation/Foundation.h>
+@import Cocoa;
 
 @interface UnreadTotal : NSObject
 @property (nonatomic, assign) NSUInteger unread;

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 <Cocoa/Cocoa.h>
-
+@import Cocoa;
 @class FeedGroup;
 
 @interface NSMenu (Ext)

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 <Cocoa/Cocoa.h>
 #import "AppHook.h"
 
 int main(int argc, const char * argv[]) {