diff options
author | Hoa V. DINH <dinh.viet.hoa@gmail.com> | 2016-06-03 18:19:12 -0700 |
---|---|---|
committer | Hoa V. DINH <dinh.viet.hoa@gmail.com> | 2016-06-03 18:19:12 -0700 |
commit | 4befa9b8a5bc4342388ba780d225e7f07551e632 (patch) | |
tree | f83f13bbd1ea6dc9c4d445461343d7d4f72691b1 | |
parent | bd3daa054025af736fba5e916a2974abcba1933d (diff) |
Use different naming for delegate methods for more compatiblity with Swift
-rw-r--r-- | src/objc/abstract/MCOAbstractMessageRendererCallback.mm | 85 | ||||
-rw-r--r-- | src/objc/abstract/MCOHTMLRendererDelegate.h | 53 | ||||
-rw-r--r-- | src/objc/abstract/MCOHTMLRendererIMAPDelegate.h | 9 |
3 files changed, 111 insertions, 36 deletions
diff --git a/src/objc/abstract/MCOAbstractMessageRendererCallback.mm b/src/objc/abstract/MCOAbstractMessageRendererCallback.mm index 392f0747..8c07a15b 100644 --- a/src/objc/abstract/MCOAbstractMessageRendererCallback.mm +++ b/src/objc/abstract/MCOAbstractMessageRendererCallback.mm @@ -24,7 +24,10 @@ MCOAbstractMessageRendererCallback::MCOAbstractMessageRendererCallback(MCOAbstra bool MCOAbstractMessageRendererCallback::canPreviewPart(AbstractPart * part) { - if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:canPreviewPart:)]) { + if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:canPreviewPart:)]) { + return [mRendererDelegate abstractMessage:mMessage canPreviewPart:MCO_TO_OBJC(part)]; + } + else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:canPreviewPart:)]) { return [mRendererDelegate MCOAbstractMessage:mMessage canPreviewPart:MCO_TO_OBJC(part)]; } return HTMLRendererTemplateCallback::canPreviewPart(part); @@ -32,7 +35,10 @@ bool MCOAbstractMessageRendererCallback::canPreviewPart(AbstractPart * part) bool MCOAbstractMessageRendererCallback::shouldShowPart(AbstractPart * part) { - if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:shouldShowPart:)]) { + if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:shouldShowPart:)]) { + return [mRendererDelegate abstractMessage:mMessage shouldShowPart:MCO_TO_OBJC(part)]; + } + else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:shouldShowPart:)]) { return [mRendererDelegate MCOAbstractMessage:mMessage shouldShowPart:MCO_TO_OBJC(part)]; } return HTMLRendererTemplateCallback::shouldShowPart(part); @@ -41,7 +47,10 @@ bool MCOAbstractMessageRendererCallback::shouldShowPart(AbstractPart * part) HashMap * MCOAbstractMessageRendererCallback::templateValuesForHeader(MessageHeader * header) { HashMap * result = NULL; - if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateValuesForHeader:)]) { + if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:templateValuesForHeader:)]) { + result = MCO_FROM_OBJC(HashMap, [mRendererDelegate abstractMessage:mMessage templateValuesForHeader:MCO_TO_OBJC(header)]); + } + else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateValuesForHeader:)]) { result = MCO_FROM_OBJC(HashMap, [mRendererDelegate MCOAbstractMessage:mMessage templateValuesForHeader:MCO_TO_OBJC(header)]); } if (result == NULL) { @@ -53,7 +62,10 @@ HashMap * MCOAbstractMessageRendererCallback::templateValuesForHeader(MessageHea HashMap * MCOAbstractMessageRendererCallback::templateValuesForPart(AbstractPart * part) { HashMap * result = NULL; - if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateValuesForPart:)]) { + if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:templateValuesForPart:)]) { + result = MCO_FROM_OBJC(HashMap, [mRendererDelegate abstractMessage:mMessage templateValuesForPart:MCO_TO_OBJC(part)]); + } + else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateValuesForPart:)]) { result = MCO_FROM_OBJC(HashMap, [mRendererDelegate MCOAbstractMessage:mMessage templateValuesForPart:MCO_TO_OBJC(part)]); } if (result == NULL) { @@ -65,7 +77,10 @@ HashMap * MCOAbstractMessageRendererCallback::templateValuesForPart(AbstractPart String * MCOAbstractMessageRendererCallback::templateForMainHeader(MessageHeader * header) { String * result = NULL; - if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateForMainHeader:)]) { + if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:templateForMainHeader:)]) { + result = MCO_FROM_OBJC(String, [mRendererDelegate abstractMessage:mMessage templateForMainHeader:MCO_TO_OBJC(header)]); + } + else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateForMainHeader:)]) { result = MCO_FROM_OBJC(String, [mRendererDelegate MCOAbstractMessage:mMessage templateForMainHeader:MCO_TO_OBJC(header)]); } if (result == NULL) { @@ -77,7 +92,10 @@ String * MCOAbstractMessageRendererCallback::templateForMainHeader(MessageHeader String * MCOAbstractMessageRendererCallback::templateForImage(AbstractPart * part) { String * result = NULL; - if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateForImage:)]) { + if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:templateForImage:)]) { + result = MCO_FROM_OBJC(String, [mRendererDelegate abstractMessage:mMessage templateForImage:MCO_TO_OBJC(part)]); + } + else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateForImage:)]) { result = MCO_FROM_OBJC(String, [mRendererDelegate MCOAbstractMessage:mMessage templateForImage:MCO_TO_OBJC(part)]); } if (result == NULL) { @@ -89,7 +107,10 @@ String * MCOAbstractMessageRendererCallback::templateForImage(AbstractPart * par String * MCOAbstractMessageRendererCallback::templateForAttachment(AbstractPart * part) { String * result = NULL; - if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateForAttachment:)]) { + if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:templateForAttachment:)]) { + result = MCO_FROM_OBJC(String, [mRendererDelegate abstractMessage:mMessage templateForAttachment:MCO_TO_OBJC(part)]); + } + else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateForAttachment:)]) { result = MCO_FROM_OBJC(String, [mRendererDelegate MCOAbstractMessage:mMessage templateForAttachment:MCO_TO_OBJC(part)]); } if (result == NULL) { @@ -101,7 +122,10 @@ String * MCOAbstractMessageRendererCallback::templateForAttachment(AbstractPart String * MCOAbstractMessageRendererCallback::templateForMessage(AbstractMessage * message) { String * result = NULL; - if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage_templateForMessage:)]) { + if ([mRendererDelegate respondsToSelector:@selector(abstractMessage_templateForMessage:)]) { + result = MCO_FROM_OBJC(String, [mRendererDelegate abstractMessage_templateForMessage:mMessage]); + } + else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage_templateForMessage:)]) { result = MCO_FROM_OBJC(String, [mRendererDelegate MCOAbstractMessage_templateForMessage:mMessage]); } if (result == NULL) { @@ -113,7 +137,10 @@ String * MCOAbstractMessageRendererCallback::templateForMessage(AbstractMessage String * MCOAbstractMessageRendererCallback::templateForEmbeddedMessage(AbstractMessagePart * part) { String * result = NULL; - if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateForEmbeddedMessage:)]) { + if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:templateForEmbeddedMessage:)]) { + result = MCO_FROM_OBJC(String, [mRendererDelegate abstractMessage:mMessage templateForEmbeddedMessage:MCO_TO_OBJC(part)]); + } + else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateForEmbeddedMessage:)]) { result = MCO_FROM_OBJC(String, [mRendererDelegate MCOAbstractMessage:mMessage templateForEmbeddedMessage:MCO_TO_OBJC(part)]); } if (result == NULL) { @@ -125,7 +152,10 @@ String * MCOAbstractMessageRendererCallback::templateForEmbeddedMessage(Abstract String * MCOAbstractMessageRendererCallback::templateForEmbeddedMessageHeader(MessageHeader * header) { String * result = NULL; - if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateForEmbeddedMessageHeader:)]) { + if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:templateForEmbeddedMessageHeader:)]) { + result = MCO_FROM_OBJC(String, [mRendererDelegate abstractMessage:mMessage templateForEmbeddedMessageHeader:MCO_TO_OBJC(header)]); + } + else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateForEmbeddedMessageHeader:)]) { result = MCO_FROM_OBJC(String, [mRendererDelegate MCOAbstractMessage:mMessage templateForEmbeddedMessageHeader:MCO_TO_OBJC(header)]); } if (result == NULL) { @@ -137,7 +167,10 @@ String * MCOAbstractMessageRendererCallback::templateForEmbeddedMessageHeader(Me String * MCOAbstractMessageRendererCallback::templateForAttachmentSeparator() { String * result = NULL; - if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage_templateForAttachmentSeparator:)]) { + if ([mRendererDelegate respondsToSelector:@selector(abstractMessage_templateForAttachmentSeparator:)]) { + result = MCO_FROM_OBJC(String, [mRendererDelegate abstractMessage_templateForAttachmentSeparator:mMessage]); + } + else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage_templateForAttachmentSeparator:)]) { result = MCO_FROM_OBJC(String, [mRendererDelegate MCOAbstractMessage_templateForAttachmentSeparator:mMessage]); } if (result == NULL) { @@ -149,7 +182,10 @@ String * MCOAbstractMessageRendererCallback::templateForAttachmentSeparator() String * MCOAbstractMessageRendererCallback::cleanHTMLForPart(String * html) { String * result = NULL; - if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:cleanHTMLForPart:)]) { + if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:cleanHTMLForPart:)]) { + result = MCO_FROM_OBJC(String, [mRendererDelegate abstractMessage:mMessage cleanHTMLForPart:MCO_TO_OBJC(html)]); + } + else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:cleanHTMLForPart:)]) { result = MCO_FROM_OBJC(String, [mRendererDelegate MCOAbstractMessage:mMessage cleanHTMLForPart:MCO_TO_OBJC(html)]); } if (result == NULL) { @@ -161,7 +197,10 @@ String * MCOAbstractMessageRendererCallback::cleanHTMLForPart(String * html) String * MCOAbstractMessageRendererCallback::filterHTMLForPart(String * html) { String * result = NULL; - if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:filterHTMLForPart:)]) { + if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:filterHTMLForPart:)]) { + result = MCO_FROM_OBJC(String, [mRendererDelegate abstractMessage:mMessage filterHTMLForPart:MCO_TO_OBJC(html)]); + } + else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:filterHTMLForPart:)]) { result = MCO_FROM_OBJC(String, [mRendererDelegate MCOAbstractMessage:mMessage filterHTMLForPart:MCO_TO_OBJC(html)]); } if (result == NULL) { @@ -173,7 +212,10 @@ String * MCOAbstractMessageRendererCallback::filterHTMLForPart(String * html) String * MCOAbstractMessageRendererCallback::filterHTMLForMessage(String * html) { String * result = NULL; - if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:filterHTMLForMessage:)]) { + if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:filterHTMLForMessage:)]) { + result = MCO_FROM_OBJC(String, [mRendererDelegate abstractMessage:mMessage filterHTMLForMessage:MCO_TO_OBJC(html)]); + } + else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:filterHTMLForMessage:)]) { result = MCO_FROM_OBJC(String, [mRendererDelegate MCOAbstractMessage:mMessage filterHTMLForMessage:MCO_TO_OBJC(html)]); } if (result == NULL) { @@ -185,7 +227,10 @@ String * MCOAbstractMessageRendererCallback::filterHTMLForMessage(String * html) Data * MCOAbstractMessageRendererCallback::dataForIMAPPart(String * folder, IMAPPart * part) { Data * result = NULL; - if ([mIMAPDelegate respondsToSelector:@selector(MCOAbstractMessage:dataForIMAPPart:folder:)]) { + if ([mIMAPDelegate respondsToSelector:@selector(abstractMessage:dataForIMAPPart:folder:)]) { + result = [[mIMAPDelegate abstractMessage:mMessage dataForIMAPPart:MCO_TO_OBJC(part) folder:MCO_TO_OBJC(folder)] mco_mcData]; + } + else if ([mIMAPDelegate respondsToSelector:@selector(MCOAbstractMessage:dataForIMAPPart:folder:)]) { result = [[mIMAPDelegate MCOAbstractMessage:mMessage dataForIMAPPart:MCO_TO_OBJC(part) folder:MCO_TO_OBJC(folder)] mco_mcData]; } return result; @@ -193,14 +238,20 @@ Data * MCOAbstractMessageRendererCallback::dataForIMAPPart(String * folder, IMAP void MCOAbstractMessageRendererCallback::prefetchAttachmentIMAPPart(String * folder, IMAPPart * part) { - if ([mIMAPDelegate respondsToSelector:@selector(MCOAbstractMessage:prefetchAttachmentIMAPPart:folder:)]) { + if ([mIMAPDelegate respondsToSelector:@selector(abstractMessage:prefetchAttachmentIMAPPart:folder:)]) { + [mIMAPDelegate abstractMessage:mMessage prefetchAttachmentIMAPPart:MCO_TO_OBJC(part) folder:MCO_TO_OBJC(folder)]; + } + else if ([mIMAPDelegate respondsToSelector:@selector(MCOAbstractMessage:prefetchAttachmentIMAPPart:folder:)]) { [mIMAPDelegate MCOAbstractMessage:mMessage prefetchAttachmentIMAPPart:MCO_TO_OBJC(part) folder:MCO_TO_OBJC(folder)]; } } void MCOAbstractMessageRendererCallback::prefetchImageIMAPPart(String * folder, IMAPPart * part) { - if ([mIMAPDelegate respondsToSelector:@selector(MCOAbstractMessage:prefetchImageIMAPPart:folder:)]) { + if ([mIMAPDelegate respondsToSelector:@selector(abstractMessage:prefetchImageIMAPPart:folder:)]) { + [mIMAPDelegate abstractMessage:mMessage prefetchImageIMAPPart:MCO_TO_OBJC(part) folder:MCO_TO_OBJC(folder)]; + } + else if ([mIMAPDelegate respondsToSelector:@selector(MCOAbstractMessage:prefetchImageIMAPPart:folder:)]) { [mIMAPDelegate MCOAbstractMessage:mMessage prefetchImageIMAPPart:MCO_TO_OBJC(part) folder:MCO_TO_OBJC(folder)]; } } diff --git a/src/objc/abstract/MCOHTMLRendererDelegate.h b/src/objc/abstract/MCOHTMLRendererDelegate.h index eb62cb75..007aaf06 100644 --- a/src/objc/abstract/MCOHTMLRendererDelegate.h +++ b/src/objc/abstract/MCOHTMLRendererDelegate.h @@ -33,23 +33,26 @@ /** All methods are optional.*/ @optional -/** This delegate method should return YES if it can render a preview of the attachment as an image. - part is always a single part. -If the attachment can be previewed, it will be rendered using the image template. -If not, the attachment template will be used.*/ -- (BOOL) MCOAbstractMessage:(MCOAbstractMessage *)msg canPreviewPart:(MCOAbstractPart *)part; + + + + + + + +- (BOOL) abstractMessage:(MCOAbstractMessage *)msg canPreviewPart:(MCOAbstractPart *)part; /** This delegate method should return YES if the part should be rendered.*/ -- (BOOL) MCOAbstractMessage:(MCOAbstractMessage *)msg shouldShowPart:(MCOAbstractPart *)part; +- (BOOL) abstractMessage:(MCOAbstractMessage *)msg shouldShowPart:(MCOAbstractPart *)part; /** This delegate method returns the values to be applied to the template for the given header. See the content of MCHTMLRendererCallback.cpp for the default values of the header.*/ -- (NSDictionary *) MCOAbstractMessage:(MCOAbstractMessage *)msg templateValuesForHeader:(MCOMessageHeader *)header; +- (NSDictionary *) abstractMessage:(MCOAbstractMessage *)msg templateValuesForHeader:(MCOMessageHeader *)header; /** This delegate method returns the values to be applied to the template for the given attachment. See the content of MCHTMLRendererCallback.cpp for the default values of the attachment.*/ -- (NSDictionary *) MCOAbstractMessage:(MCOAbstractMessage *)msg templateValuesForPart:(MCOAbstractPart *)part; +- (NSDictionary *) abstractMessage:(MCOAbstractMessage *)msg templateValuesForPart:(MCOAbstractPart *)part; /** @name Template Methods The following methods returns templates. They will match the syntax of ctemplate. @@ -57,36 +60,36 @@ If not, the attachment template will be used.*/ /** This delegate method returns the template for the main header of the message. See the content of MCHTMLRendererCallback.cpp for the default values of the template.*/ -- (NSString *) MCOAbstractMessage:(MCOAbstractMessage *)msg templateForMainHeader:(MCOMessageHeader *)header; +- (NSString *) abstractMessage:(MCOAbstractMessage *)msg templateForMainHeader:(MCOMessageHeader *)header; /** This delegate method returns the template an image attachment.*/ -- (NSString *) MCOAbstractMessage:(MCOAbstractMessage *)msg templateForImage:(MCOAbstractPart *)header; +- (NSString *) abstractMessage:(MCOAbstractMessage *)msg templateForImage:(MCOAbstractPart *)header; /** This delegate method returns the template attachment other than images. See the content of MCHTMLRendererCallback.cpp for the default values of the template.*/ -- (NSString *) MCOAbstractMessage:(MCOAbstractMessage *)msg templateForAttachment:(MCOAbstractPart *)part; +- (NSString *) abstractMessage:(MCOAbstractMessage *)msg templateForAttachment:(MCOAbstractPart *)part; /** This delegate method returns the template of the main message. It should include HEADER and a BODY values. See the content of MCHTMLRendererCallback.cpp for the default values of the template.*/ -- (NSString *) MCOAbstractMessage_templateForMessage:(MCOAbstractMessage *)msg; +- (NSString *) abstractMessage_templateForMessage:(MCOAbstractMessage *)msg; /** This delegate method returns the template of an embedded message (included as attachment). It should include HEADER and a BODY values. See the content of MCHTMLRendererCallback.cpp for the default values of the template.*/ -- (NSString *) MCOAbstractMessage:(MCOAbstractMessage *)msg templateForEmbeddedMessage:(MCOAbstractMessagePart *)part; +- (NSString *) abstractMessage:(MCOAbstractMessage *)msg templateForEmbeddedMessage:(MCOAbstractMessagePart *)part; /** This delegate method returns the template for the header of an embedded message. See the content of MCHTMLRendererCallback.cpp for the default values of the template.*/ -- (NSString *) MCOAbstractMessage:(MCOAbstractMessage *)msg templateForEmbeddedMessageHeader:(MCOMessageHeader *)header; +- (NSString *) abstractMessage:(MCOAbstractMessage *)msg templateForEmbeddedMessageHeader:(MCOMessageHeader *)header; /** This delegate method returns the separator between the text of the message and the attachments.*/ -- (NSString *) MCOAbstractMessage_templateForAttachmentSeparator:(MCOAbstractMessage *)msg; +- (NSString *) abstractMessage_templateForAttachmentSeparator:(MCOAbstractMessage *)msg; /** This delegate method cleans HTML content. For example, it could fix broken tags, add missing <html>, <body> tags. Default implementation uses HTMLCleaner::cleanHTML to clean HTML content. */ -- (NSString *) MCOAbstractMessage:(MCOAbstractMessage *)msg cleanHTMLForPart:(NSString *)html; +- (NSString *) abstractMessage:(MCOAbstractMessage *)msg cleanHTMLForPart:(NSString *)html; /** @name Filters @@ -95,10 +98,26 @@ If not, the attachment template will be used.*/ /** This delegate method will apply the filter to HTML rendered content of a given text part. For example, it could filter the CSS content.*/ -- (NSString *) MCOAbstractMessage:(MCOAbstractMessage *)msg filterHTMLForPart:(NSString *)html; +- (NSString *) abstractMessage:(MCOAbstractMessage *)msg filterHTMLForPart:(NSString *)html; /** This delegate method will apply a filter to the whole HTML content. For example, it could collapse the quoted messages.*/ +- (NSString *) abstractMessage:(MCOAbstractMessage *)msg filterHTMLForMessage:(NSString *)html; + +// deprecated versions of the delegate methods. +- (BOOL) MCOAbstractMessage:(MCOAbstractMessage *)msg canPreviewPart:(MCOAbstractPart *)part; +- (BOOL) MCOAbstractMessage:(MCOAbstractMessage *)msg shouldShowPart:(MCOAbstractPart *)part; +- (NSDictionary *) MCOAbstractMessage:(MCOAbstractMessage *)msg templateValuesForHeader:(MCOMessageHeader *)header; +- (NSDictionary *) MCOAbstractMessage:(MCOAbstractMessage *)msg templateValuesForPart:(MCOAbstractPart *)part; +- (NSString *) MCOAbstractMessage:(MCOAbstractMessage *)msg templateForMainHeader:(MCOMessageHeader *)header; +- (NSString *) MCOAbstractMessage:(MCOAbstractMessage *)msg templateForImage:(MCOAbstractPart *)header; +- (NSString *) MCOAbstractMessage:(MCOAbstractMessage *)msg templateForAttachment:(MCOAbstractPart *)part; +- (NSString *) MCOAbstractMessage_templateForMessage:(MCOAbstractMessage *)msg; +- (NSString *) MCOAbstractMessage:(MCOAbstractMessage *)msg templateForEmbeddedMessage:(MCOAbstractMessagePart *)part; +- (NSString *) MCOAbstractMessage:(MCOAbstractMessage *)msg templateForEmbeddedMessageHeader:(MCOMessageHeader *)header; +- (NSString *) MCOAbstractMessage_templateForAttachmentSeparator:(MCOAbstractMessage *)msg; +- (NSString *) MCOAbstractMessage:(MCOAbstractMessage *)msg cleanHTMLForPart:(NSString *)html; +- (NSString *) MCOAbstractMessage:(MCOAbstractMessage *)msg filterHTMLForPart:(NSString *)html; - (NSString *) MCOAbstractMessage:(MCOAbstractMessage *)msg filterHTMLForMessage:(NSString *)html; @end diff --git a/src/objc/abstract/MCOHTMLRendererIMAPDelegate.h b/src/objc/abstract/MCOHTMLRendererIMAPDelegate.h index a127ec27..9ec665da 100644 --- a/src/objc/abstract/MCOHTMLRendererIMAPDelegate.h +++ b/src/objc/abstract/MCOHTMLRendererIMAPDelegate.h @@ -33,18 +33,23 @@ start fetching the attachment. It will return the data synchronously if it has already fetched it. */ -- (NSData *) MCOAbstractMessage:(MCOAbstractMessage *)msg dataForIMAPPart:(MCOIMAPPart *)part folder:(NSString *)folder; +- (NSData *) abstractMessage:(MCOAbstractMessage *)msg dataForIMAPPart:(MCOIMAPPart *)part folder:(NSString *)folder; /** The delegate method will notify the delegate to start fetching the given part. It will be used to render an attachment that cannot be previewed. */ -- (void) MCOAbstractMessage:(MCOAbstractMessage *)msg prefetchAttachmentIMAPPart:(MCOIMAPPart *)part folder:(NSString *)folder; +- (void) abstractMessage:(MCOAbstractMessage *)msg prefetchAttachmentIMAPPart:(MCOIMAPPart *)part folder:(NSString *)folder; /** The delegate method will notify the delegate to start fetching the given part. It will be used to render an attachment that can be previewed. */ +- (void) abstractMessage:(MCOAbstractMessage *)msg prefetchImageIMAPPart:(MCOIMAPPart *)part folder:(NSString *)folder; + +// deprecated versions of the delegate methods. +- (NSData *) MCOAbstractMessage:(MCOAbstractMessage *)msg dataForIMAPPart:(MCOIMAPPart *)part folder:(NSString *)folder; +- (void) MCOAbstractMessage:(MCOAbstractMessage *)msg prefetchAttachmentIMAPPart:(MCOIMAPPart *)part folder:(NSString *)folder; - (void) MCOAbstractMessage:(MCOAbstractMessage *)msg prefetchImageIMAPPart:(MCOIMAPPart *)part folder:(NSString *)folder; @end |