diff options
| author |  Tom Harrington <tph@atomicbird.com> | 2017-12-29 20:48:41 -0700 |
|---|---|---|
| committer |  Hoà V. DINH <dinh.viet.hoa@gmail.com> | 2017-12-29 19:48:41 -0800 |
| commit | e8dc319c2e5d9c0e49c03776276563572943d4f7 (patch) | |
| tree | afaec5c949125987e4e08d793d09e5d384afa0e8 | |
| parent | fa08441233e3acb4931be461e32fef00ac671606 (diff) | |
Move unavailable initializers out of categories, so they’ll be properly handled in Swift. (#1698)
If NS_UNAVAILABLE is used in a category, Swift doesn’t notice, and these initializers are permitted even though they don’t work.
| -rw-r--r-- | src/objc/abstract/MCOAbstractPart.h | 5 | ||||
| -rw-r--r-- | src/objc/provider/MCOMailProvider.h | 5 | ||||
| -rw-r--r-- | src/objc/provider/MCONetService.h | 5 | ||||
| -rw-r--r-- | src/objc/utils/MCOOperation.h | 5 |
4 files changed, 4 insertions, 16 deletions
diff --git a/src/objc/abstract/MCOAbstractPart.h b/src/objc/abstract/MCOAbstractPart.h index 8bff41dd..133a6f25 100644 --- a/src/objc/abstract/MCOAbstractPart.h +++ b/src/objc/abstract/MCOAbstractPart.h @@ -107,10 +107,7 @@ namespace mailcore { /** Returns an array with the names of all content type parameters.*/ - (NSArray * /* NSString */) allContentTypeParametersNames; -@end - -@interface MCOAbstractPart (MCOUnavailable) - +#pragma mark - Unavailable initializers /** Do not invoke this directly. */ - (instancetype) init NS_UNAVAILABLE; /** Do not invoke this directly. */ diff --git a/src/objc/provider/MCOMailProvider.h b/src/objc/provider/MCOMailProvider.h index 513d568e..79f00357 100644 --- a/src/objc/provider/MCOMailProvider.h +++ b/src/objc/provider/MCOMailProvider.h @@ -83,10 +83,7 @@ */ - (NSString *) importantFolderPath; -@end - -@interface MCOMailProvider (MCOUnavailable) - +#pragma mark - Unavailable initializers /** Do not invoke this directly. */ - (instancetype) init NS_UNAVAILABLE; /** Do not invoke this directly. */ diff --git a/src/objc/provider/MCONetService.h b/src/objc/provider/MCONetService.h index 0d707152..01a6e094 100644 --- a/src/objc/provider/MCONetService.h +++ b/src/objc/provider/MCONetService.h @@ -38,10 +38,7 @@ */ - (NSString *) hostnameWithEmail:(NSString *)email; -@end - -@interface MCONetService (MCOUnavailable) - +#pragma mark - Unavailable initializers /** Do not invoke this directly. */ - (instancetype) init NS_UNAVAILABLE; /** Do not invoke this directly. */ diff --git a/src/objc/utils/MCOOperation.h b/src/objc/utils/MCOOperation.h index 65f77681..1c4583e4 100644 --- a/src/objc/utils/MCOOperation.h +++ b/src/objc/utils/MCOOperation.h @@ -36,10 +36,7 @@ /** Cancel the operation.*/ - (void) cancel; -@end - -@interface MCOOperation (MCOUnavailable) - +#pragma mark - Unavailable initializers /** Do not invoke this directly. */ - (instancetype) init NS_UNAVAILABLE; /** Do not invoke this directly. */ |