From c1a28d210641320f3e7f40ec940cf475fc443e97 Mon Sep 17 00:00:00 2001 From: "Hoa V. DINH" Date: Sat, 19 Nov 2016 17:26:44 -0800 Subject: Revert "Add type annotations to some operations and MCPIMAPSession (#1531)" This reverts commit efce413258a838818a39a12f0f86d563c8488468. --- src/objc/imap/MCOIMAPFetchFoldersOperation.h | 3 +-- src/objc/imap/MCOIMAPFetchFoldersOperation.mm | 2 +- src/objc/imap/MCOIMAPFetchMessagesOperation.h | 5 ++--- src/objc/imap/MCOIMAPFetchMessagesOperation.mm | 2 +- src/objc/imap/MCOIMAPSession.h | 12 ++++++------ 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/objc/imap/MCOIMAPFetchFoldersOperation.h b/src/objc/imap/MCOIMAPFetchFoldersOperation.h index b69a24fe..a2954d29 100644 --- a/src/objc/imap/MCOIMAPFetchFoldersOperation.h +++ b/src/objc/imap/MCOIMAPFetchFoldersOperation.h @@ -13,7 +13,6 @@ /** This class implements an operation to fetch a list of folders. */ #import -@class MCOIMAPFolder; NS_ASSUME_NONNULL_BEGIN @interface MCOIMAPFetchFoldersOperation : MCOIMAPBaseOperation @@ -28,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN - On failure, `error` will be set with `MCOErrorDomain` as domain and an error code available in `MCOConstants.h`, `folders` will be nil */ -- (void) start:(void (^)(NSError * __nullable error, NSArray * __nullable folders))completionBlock; +- (void) start:(void (^)(NSError * __nullable error, NSArray * /* MCOIMAPFolder */ __nullable folders))completionBlock; @end NS_ASSUME_NONNULL_END diff --git a/src/objc/imap/MCOIMAPFetchFoldersOperation.mm b/src/objc/imap/MCOIMAPFetchFoldersOperation.mm index 28b907b2..b0965401 100644 --- a/src/objc/imap/MCOIMAPFetchFoldersOperation.mm +++ b/src/objc/imap/MCOIMAPFetchFoldersOperation.mm @@ -43,7 +43,7 @@ typedef void (^CompletionType)(NSError *error, NSArray *folder); [super dealloc]; } -- (void) start:(void (^)(NSError *error, NSArray * folders))completionBlock +- (void) start:(void (^)(NSError *error, NSArray * /* MCOIMAPFolder */ folders))completionBlock { _completionBlock = [completionBlock copy]; [self start]; diff --git a/src/objc/imap/MCOIMAPFetchMessagesOperation.h b/src/objc/imap/MCOIMAPFetchMessagesOperation.h index 1958da63..ac1506c0 100644 --- a/src/objc/imap/MCOIMAPFetchMessagesOperation.h +++ b/src/objc/imap/MCOIMAPFetchMessagesOperation.h @@ -16,7 +16,6 @@ /** This class implements an operation to fetch a list of messages from a folder */ @class MCOIndexSet; -@class MCOIMAPMessage; NS_ASSUME_NONNULL_BEGIN @interface MCOIMAPFetchMessagesOperation : MCOIMAPBaseOperation @@ -25,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, copy) MCOIMAPBaseOperationItemProgressBlock progress; /** Extra headers to request. Must set requestKind | IMAPMessagesRequestKindExtraHeaders */ -@property (nonatomic, copy) NSArray * extraHeaders; +@property (nonatomic, copy) NSArray * extraHeaders; /** Starts the asynchronous fetch operation. @@ -40,7 +39,7 @@ NS_ASSUME_NONNULL_BEGIN If you are not supporting QRESYNC you can safely ignore `vanishedMessages`. */ -- (void) start:(void (^)(NSError * __nullable error, NSArray * __nullable messages, MCOIndexSet * __nullable vanishedMessages))completionBlock; +- (void) start:(void (^)(NSError * __nullable error, NSArray * /* MCOIMAPMessage */ __nullable messages, MCOIndexSet * __nullable vanishedMessages))completionBlock; @end NS_ASSUME_NONNULL_END diff --git a/src/objc/imap/MCOIMAPFetchMessagesOperation.mm b/src/objc/imap/MCOIMAPFetchMessagesOperation.mm index a29a05fb..83012ca5 100644 --- a/src/objc/imap/MCOIMAPFetchMessagesOperation.mm +++ b/src/objc/imap/MCOIMAPFetchMessagesOperation.mm @@ -41,7 +41,7 @@ typedef void (^CompletionType)(NSError *error, NSArray * messages, MCOIndexSet * [super dealloc]; } -- (void) start:(void (^)(NSError *error, NSArray * messages, MCOIndexSet * vanishedMessages))completionBlock +- (void) start:(void (^)(NSError *error, NSArray * messages, MCOIndexSet * vanishedMessages))completionBlock { _completionBlock = [completionBlock copy]; [self start]; diff --git a/src/objc/imap/MCOIMAPSession.h b/src/objc/imap/MCOIMAPSession.h index 661ce79c..2e2d55a9 100644 --- a/src/objc/imap/MCOIMAPSession.h +++ b/src/objc/imap/MCOIMAPSession.h @@ -305,7 +305,7 @@ - (MCOIMAPAppendMessageOperation *)appendMessageOperationWithFolder:(NSString *)folder messageData:(NSData *)messageData flags:(MCOMessageFlag)flags - customFlags:(NSArray *)customFlags; + customFlags:(NSArray *)customFlags; /** Returns an operation to add a message with custom flags to a folder. @@ -323,7 +323,7 @@ - (MCOIMAPAppendMessageOperation *)appendMessageOperationWithFolder:(NSString *)folder contentsAtPath:(NSString *)path flags:(MCOMessageFlag)flags - customFlags:(NSArray *)customFlags; + customFlags:(NSArray *)customFlags; /** Returns an operation to copy messages to a folder. @@ -407,7 +407,7 @@ uids:(MCOIndexSet *)uids kind:(MCOIMAPStoreFlagsRequestKind)kind flags:(MCOMessageFlag)flags - customFlags:(NSArray *)customFlags; + customFlags:(NSArray *)customFlags; /** @@ -428,7 +428,7 @@ numbers:(MCOIndexSet *)numbers kind:(MCOIMAPStoreFlagsRequestKind)kind flags:(MCOMessageFlag)flags - customFlags:(NSArray *)customFlags; + customFlags:(NSArray *)customFlags; /** Returns an operation to change labels of messages. Intended for Gmail @@ -446,7 +446,7 @@ - (MCOIMAPOperation *) storeLabelsOperationWithFolder:(NSString *)folder numbers:(MCOIndexSet *)numbers kind:(MCOIMAPStoreFlagsRequestKind)kind - labels:(NSArray *)labels; + labels:(NSArray *)labels; /** Returns an operation to change labels of messages. Intended for Gmail @@ -464,7 +464,7 @@ - (MCOIMAPOperation *) storeLabelsOperationWithFolder:(NSString *)folder uids:(MCOIndexSet *)uids kind:(MCOIMAPStoreFlagsRequestKind)kind - labels:(NSArray *)labels; + labels:(NSArray *)labels; /** @name Fetching Messages */ -- cgit v1.2.3