[refact] Cleaning import in headers

Lisapple · Lisapple · commit effa9fabe211 · 2017-01-05T18:23:19.000+01:00
diff --git a/CloudView.h b/CloudView.h
@@ -6,8 +6,6 @@
 //  Copyright (c) 2013 Lis@cintosh. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
-
 #import "Verb.h"
 
 @interface CloudLabel : UILabel
diff --git a/CloudViewController.h b/CloudViewController.h
@@ -6,8 +6,6 @@
 //  Copyright (c) 2013 Lis@cintosh. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
-
 @interface CloudViewController : UIViewController <UINavigationControllerDelegate>
 {
 	NSArray * verbs;
diff --git a/EditNoteViewController.h b/EditNoteViewController.h
@@ -6,8 +6,6 @@
 //
 //
 
-#import <UIKit/UIKit.h>
-
 #import "Verb.h"
 
 @interface EditNoteViewController : UIViewController
diff --git a/Fabric.framework/Headers/FABAttributes.h b/Fabric.framework/Headers/FABAttributes.h
@@ -21,22 +21,11 @@
 
 #define FAB_UNAVAILABLE(x) __attribute__((unavailable(x)))
 
-#if __has_feature(nullability)
-    #define fab_nullable           nullable
-    #define fab_nonnull            nonnull
-    #define fab_null_unspecified   null_unspecified
-    #define fab_null_resettable    null_resettable
-    #define __fab_nullable         __nullable
-    #define __fab_nonnull          __nonnull
-    #define __fab_null_unspecified __null_unspecified
-#else
-    #define fab_nullable
-    #define fab_nonnull
-    #define fab_null_unspecified
-    #define fab_null_resettable
-    #define __fab_nullable
-    #define __fab_nonnull
-    #define __fab_null_unspecified
+#if !__has_feature(nullability)
+    #define nonnull
+    #define nullable
+    #define _Nullable
+    #define _Nonnull
 #endif
 
 #ifndef NS_ASSUME_NONNULL_BEGIN
@@ -51,9 +40,11 @@
 /**
  * The following macros are defined here to provide
  * backwards compatability. If you are still using
- * them you should migrate to the new versions that
- * are defined above.
+ * them you should migrate to the native nullability
+ * macros.
  */
+#define fab_nullable      nullable
+#define fab_nonnull       nonnull
 #define FAB_NONNULL       __fab_nonnull
 #define FAB_NULLABLE      __fab_nullable
 #define FAB_START_NONNULL NS_ASSUME_NONNULL_BEGIN
diff --git a/Fabric.framework/Headers/Fabric.h b/Fabric.framework/Headers/Fabric.h
@@ -71,6 +71,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (id)init FAB_UNAVAILABLE("Use +sharedSDK to retrieve the shared Fabric instance.");
 
+/**
+ *  Unavailable. Use `+sharedSDK` to retrieve the shared Fabric instance.
+ */
++ (instancetype)new FAB_UNAVAILABLE("Use +sharedSDK to retrieve the shared Fabric instance.");
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/IVWebView.h b/IVWebView.h
@@ -6,8 +6,6 @@
 //
 //
 
-#import <UIKit/UIKit.h>
-
 @interface IVWebView : UIWebView
 
 @end
diff --git a/NSDate+addition.h b/NSDate+addition.h
@@ -6,9 +6,6 @@
 //  Copyright 2011 Lis@cintosh. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
-
-
 @interface NSDate(addition)
 
 - (NSInteger)second;
diff --git a/NSMutableAttributedString+addition.h b/NSMutableAttributedString+addition.h
@@ -6,8 +6,6 @@
 //
 //
 
-#import <Foundation/Foundation.h>
-
 @interface NSMutableAttributedString (addition)
 
 - (void)appendString:(NSString *)string attributes:(NSDictionary *)attributes;
diff --git a/NSString+addition.h b/NSString+addition.h
@@ -6,8 +6,6 @@
 //
 //
 
-#import <Foundation/Foundation.h>
-
 @interface NSString (addition)
 
 - (NSAttributedString *)highlightOccurrencesOfString:(NSString *)occurence fontSize:(CGFloat)fontSize;
diff --git a/QuizResult.h b/QuizResult.h
@@ -6,8 +6,7 @@
 //
 //
 
-#import <Foundation/Foundation.h>
-#import <CoreData/CoreData.h>
+@import CoreData;
 
 @class Playlist;
 
@@ -18,4 +17,4 @@
 @property (nonatomic, retain) NSNumber * wrongResponses;
 @property (nonatomic, retain) Playlist * playlist;
 
-@end
+@end
diff --git a/QuizViewController.h b/QuizViewController.h
@@ -6,9 +6,9 @@
 //
 //
 
-#import <UIKit/UIKit.h>
-
 #import "Playlist.h"
+@import AVFoundation;
+@import Speech;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -60,4 +60,4 @@ typedef NS_ENUM(NSUInteger, VerbForm) {
 
 @end
 
-NS_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END
diff --git a/Shared/ManagedObjectContext.h b/Shared/ManagedObjectContext.h
@@ -6,8 +6,6 @@
 //  Copyright (c) 2012 Lis@cintosh. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
-
 @protocol ManagedObjectContext <NSObject>
 
 - (NSManagedObjectContext *)managedObjectContext;
diff --git a/Shared/Playlist+additions.h b/Shared/Playlist+additions.h
@@ -6,8 +6,8 @@
 //  Copyright (c) 2012 Lis@cintosh. All rights reserved.
 //
 
-#import <CoreSpotlight/CoreSpotlight.h>
-#import <MobileCoreServices/MobileCoreServices.h>
+@import CoreSpotlight;
+@import MobileCoreServices;
 
 #import "Playlist.h"
 
diff --git a/Shared/Playlist.h b/Shared/Playlist.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2012 Lis@cintosh. All rights reserved.
 //
 
-#import <CoreData/CoreData.h>
+@import CoreData;
 
 @class Verb;
 @class QuizResult;
diff --git a/Shared/Quote.h b/Shared/Quote.h
@@ -6,7 +6,7 @@
 //
 //
 
-#import <CoreData/CoreData.h>
+@import CoreData;
 
 #import "Verb.h"
 
diff --git a/Shared/Verb.h b/Shared/Verb.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2012 Lis@cintosh. All rights reserved.
 //
 
-#import <CoreData/CoreData.h>
+@import CoreData;
 
 @class Playlist;
 @class Quote;
diff --git a/Shared/main.m b/Shared/main.m
@@ -6,8 +6,6 @@
 //  Copyright Lisacintosh 2010. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
-
 #import "AppDelegate_Phone.h"
 #import "AppDelegate_Pad.h"
 
diff --git a/UIApplication+addition.h b/UIApplication+addition.h
@@ -6,8 +6,6 @@
 //
 //
 
-#import <UIKit/UIKit.h>
-
 @interface UIApplication (addition)
 
 - (void)openExternalURL:(NSURL *)url;
diff --git a/UINavigationController+addition.h b/UINavigationController+addition.h
@@ -6,8 +6,6 @@
 //
 //
 
-#import <UIKit/UIKit.h>
-
 @interface UINavigationController (addition)
 
 @end
diff --git a/iPad/AppDelegate_Pad.h b/iPad/AppDelegate_Pad.h
@@ -6,11 +6,10 @@
 //  Copyright Lisacintosh 2010. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
-#import <CoreData/CoreData.h>
-#import <CoreSpotlight/CoreSpotlight.h>
-
-#import "MainViewController.h"
+@import CoreData;
+@import CoreSpotlight;
+@import Fabric;
+@import Crashlytics;
 
 #import "ManagedObjectContext.h"
 
diff --git a/iPad/AppDelegate_Pad.m b/iPad/AppDelegate_Pad.m
@@ -8,9 +8,9 @@
 
 #import "AppDelegate_Pad.h"
 #import "QuizViewController.h"
+#import "MainViewController.h"
 
-#import <Fabric/Fabric.h>
-#import <Crashlytics/Crashlytics.h>
+#import "ManagedObjectContext.h"
 
 @implementation AppDelegate_Pad
 
diff --git a/iPad/MainViewController.h b/iPad/MainViewController.h
@@ -6,10 +6,9 @@
 //  Copyright (c) 2012 Lis@cintosh. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
-#import <CoreData/CoreData.h>
-#import <MessageUI/MessageUI.h>
-#import <AVFoundation/AVFoundation.h>
+@import CoreData;
+@import MessageUI;
+@import AVFoundation;
 
 #import "IVWebView.h"
 
@@ -19,8 +18,6 @@
 #import "Playlist+additions.h"
 
 @interface MainViewController : UISplitViewController
-<UIPopoverControllerDelegate, UIPopoverPresentationControllerDelegate, UIWebViewDelegate, MFMailComposeViewControllerDelegate>
-{
-}
+	<UIPopoverControllerDelegate, UIPopoverPresentationControllerDelegate, UIWebViewDelegate, MFMailComposeViewControllerDelegate>
 
 @end
diff --git a/iPad/VerbOptionsViewController_Pad.h b/iPad/VerbOptionsViewController_Pad.h
@@ -6,8 +6,6 @@
 //  Copyright (c) 2012 Lis@cintosh. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
-
 #import "Playlist.h"
 #import "Verb.h"
 
diff --git a/iPad/WebViewController.h b/iPad/WebViewController.h
@@ -6,8 +6,6 @@
 //
 //
 
-#import <UIKit/UIKit.h>
-
 @interface WebViewController : UIViewController
 
 @property (nonatomic, assign) IBOutlet UIWebView * webView;
diff --git a/iPhone/AboutViewController.h b/iPhone/AboutViewController.h
@@ -6,7 +6,8 @@
 //
 //
 
-#import <UIKit/UIKit.h>
+@import SafariServices;
+@import Crashlytics;
 
 @interface AboutViewController : UITableViewController
 
diff --git a/iPhone/AboutViewController.m b/iPhone/AboutViewController.m
@@ -7,8 +7,6 @@
 //
 
 #import "AboutViewController.h"
-#import <SafariServices/SafariServices.h>
-#import <Crashlytics/Crashlytics.h>
 
 #import "NSDate+addition.h"
 #import "UIApplication+addition.h"
diff --git a/iPhone/AppDelegate_Phone.h b/iPhone/AppDelegate_Phone.h
@@ -6,13 +6,13 @@
 //  Copyright Lisacintosh 2010. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
-#import <CoreData/CoreData.h>
-#import <QuartzCore/QuartzCore.h>
-#import <CoreSpotlight/CoreSpotlight.h>
+@import CoreData;
+@import QuartzCore;
+@import CoreSpotlight;
+@import Fabric;
 
-#import "ManagedObjectContext.h"
 #import "Playlist+additions.h"
+#import "ManagedObjectContext.h"
 
 @interface AppDelegate_Phone : UIResponder <UIApplicationDelegate, UITabBarDelegate, ManagedObjectContext>
  
diff --git a/iPhone/AppDelegate_Phone.m b/iPhone/AppDelegate_Phone.m
@@ -16,9 +16,6 @@
 #import "SearchViewController.h"
 #import "ResultViewController.h"
 
-#import <Fabric/Fabric.h>
-#import <Crashlytics/Crashlytics.h>
-
 @implementation AppDelegate_Phone
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
diff --git a/iPhone/EditableTableViewCell.h b/iPhone/EditableTableViewCell.h
@@ -6,8 +6,6 @@
 //  Copyright (c) 2012 Lis@cintosh. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
-
 @class EditableTableViewCell;
 @protocol EditableTableViewCellDelegate
 
diff --git a/iPhone/HelpViewController.h b/iPhone/HelpViewController.h
@@ -6,8 +6,6 @@
 //  Copyright (c) 2013 Lis@cintosh. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
-
 @interface HelpViewController : UIViewController <UIWebViewDelegate>
 
 @property (nonatomic, assign) IBOutlet UIWebView * webView;
diff --git a/iPhone/LandscapeViewController.h b/iPhone/LandscapeViewController.h
@@ -6,8 +6,6 @@
 //  Copyright (c) 2012 Lis@cintosh. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
-
 @interface LandscapeViewController : UIViewController
 
 @property (nonatomic, assign) IBOutlet UIWebView * webView;
diff --git a/iPhone/PlaylistsViewController.h b/iPhone/PlaylistsViewController.h
@@ -6,8 +6,6 @@
 //  Copyright 2011 Lis@cintosh. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
-
 #import "Playlist.h"
 
 #import "EditableTableViewCell.h"
diff --git a/iPhone/ResultViewController.h b/iPhone/ResultViewController.h
@@ -6,10 +6,9 @@
 //  Copyright 2010 Lisacintosh. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
-#import <CoreData/CoreData.h>
-#import <MessageUI/MessageUI.h>
-#import <AVFoundation/AVFoundation.h>
+@import CoreData;
+@import MessageUI;
+@import AVFoundation;
 
 #import "IVWebView.h"
 
diff --git a/iPhone/ResultViewController.m b/iPhone/ResultViewController.m
diff --git a/iPhone/SearchResultsViewController.h b/iPhone/SearchResultsViewController.h
diff --git a/iPhone/SearchViewController.h b/iPhone/SearchViewController.h
diff --git a/iPhone/VerbOptionsViewController_Phone.h b/iPhone/VerbOptionsViewController_Phone.h

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@`
`6`	`6`	`// Copyright (c) 2013 Lis@cintosh. All rights reserved.`
`7`	`7`	`//`
`8`	`8`
`9`		`-#import <UIKit/UIKit.h>`
`10`		`-`
`11`	`9`	`@interface CloudViewController : UIViewController <UINavigationControllerDelegate>`
`12`	`10`	`{`
`13`	`11`	`NSArray * verbs;`