From ccc3de359747a402f2772bda59d51534237117fb Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 13 Aug 2021 10:35:19 -0400 Subject: [PATCH] style: capitalize TNEF in file names --- SoObjects/Mailer/GNUmakefile | 2 +- SoObjects/Mailer/SOGoMailBodyPart.m | 2 +- ...SOGoTnefMailBodyPart.h => SOGoTNEFMailBodyPart.h} | 8 ++++---- ...SOGoTnefMailBodyPart.m => SOGoTNEFMailBodyPart.m} | 8 ++++---- SoObjects/Mailer/product.plist | 2 +- UI/MailPartViewers/GNUmakefile | 2 +- ...xMailPartTnefViewer.h => UIxMailPartTNEFViewer.h} | 4 ++-- ...xMailPartTnefViewer.m => UIxMailPartTNEFViewer.m} | 12 ++++++------ UI/MailPartViewers/UIxMailRenderingContext.m | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) rename SoObjects/Mailer/{SOGoTnefMailBodyPart.h => SOGoTNEFMailBodyPart.h} (89%) rename SoObjects/Mailer/{SOGoTnefMailBodyPart.m => SOGoTNEFMailBodyPart.m} (99%) rename UI/MailPartViewers/{UIxMailPartTnefViewer.h => UIxMailPartTNEFViewer.h} (89%) rename UI/MailPartViewers/{UIxMailPartTnefViewer.m => UIxMailPartTNEFViewer.m} (93%) diff --git a/SoObjects/Mailer/GNUmakefile b/SoObjects/Mailer/GNUmakefile index 9845246d5..2977dd5bd 100644 --- a/SoObjects/Mailer/GNUmakefile +++ b/SoObjects/Mailer/GNUmakefile @@ -30,7 +30,7 @@ Mailer_OBJC_FILES += \ SOGoImageMailBodyPart.m \ SOGoMessageMailBodyPart.m \ SOGoCalendarMailBodyPart.m \ - SOGoTnefMailBodyPart.m \ + SOGoTNEFMailBodyPart.m \ SOGoVCardMailBodyPart.m \ \ SOGoMailForward.m \ diff --git a/SoObjects/Mailer/SOGoMailBodyPart.m b/SoObjects/Mailer/SOGoMailBodyPart.m index 8843bd4aa..a91c542e6 100644 --- a/SoObjects/Mailer/SOGoMailBodyPart.m +++ b/SoObjects/Mailer/SOGoMailBodyPart.m @@ -588,7 +588,7 @@ static BOOL debugOn = NO; else if ([mimeType isEqualToString: @"message/rfc822"]) classString = @"SOGoMessageMailBodyPart"; else if ([mimeType isEqualToString: @"application/ms-tnef"]) - classString = @"SOGoTnefMailBodyPart"; + classString = @"SOGoTNEFMailBodyPart"; else { classString = @"SOGoMailBodyPart"; diff --git a/SoObjects/Mailer/SOGoTnefMailBodyPart.h b/SoObjects/Mailer/SOGoTNEFMailBodyPart.h similarity index 89% rename from SoObjects/Mailer/SOGoTnefMailBodyPart.h rename to SoObjects/Mailer/SOGoTNEFMailBodyPart.h index 416146272..9a6b7f2ce 100644 --- a/SoObjects/Mailer/SOGoTnefMailBodyPart.h +++ b/SoObjects/Mailer/SOGoTNEFMailBodyPart.h @@ -19,14 +19,14 @@ 02111-1307, USA. */ -#ifndef __Mailer_SOGoTnefMailBodyPart_H__ -#define __Mailer_SOGoTnefMailBodyPart_H__ +#ifndef __Mailer_SOGoTNEFMailBodyPart_H__ +#define __Mailer_SOGoTNEFMailBodyPart_H__ #import "SOGoMailBodyPart.h" @class NGMimeBodyPart; -@interface SOGoTnefMailBodyPart : SOGoMailBodyPart +@interface SOGoTNEFMailBodyPart : SOGoMailBodyPart { BOOL debugOn; NSData *part; @@ -50,4 +50,4 @@ @end -#endif /* __Mailer_SOGoTnefMailBodyPart_H__ */ +#endif /* __Mailer_SOGoTNEFMailBodyPart_H__ */ diff --git a/SoObjects/Mailer/SOGoTnefMailBodyPart.m b/SoObjects/Mailer/SOGoTNEFMailBodyPart.m similarity index 99% rename from SoObjects/Mailer/SOGoTnefMailBodyPart.m rename to SoObjects/Mailer/SOGoTNEFMailBodyPart.m index 575c40b90..cea867d54 100644 --- a/SoObjects/Mailer/SOGoTnefMailBodyPart.m +++ b/SoObjects/Mailer/SOGoTNEFMailBodyPart.m @@ -39,14 +39,14 @@ #import -#import "SOGoTnefMailBodyPart.h" +#import "SOGoTNEFMailBodyPart.h" #define UPR_TO_ATTENDEES_STRING 0x823B #define UPR_CC_ATTENDEES_STRING 0x823C #define UPR_ALL_ATTENDEES_STRING 0x8238 /* - SOGoTnefMailBodyPart + SOGoTNEFMailBodyPart A specialized SOGoMailBodyPart subclass for application/ms-tnef attachments. Can be used to attach special SoMethods. @@ -162,7 +162,7 @@ unsigned char GetRruleMonthNum(unsigned char a, unsigned char b) { return (0); } -@implementation SOGoTnefMailBodyPart +@implementation SOGoTNEFMailBodyPart /* Overwritten methods */ @@ -951,4 +951,4 @@ unsigned char GetRruleMonthNum(unsigned char a, unsigned char b) { return bodyPart; } -@end /* SOGoTnefMailBodyPart */ +@end /* SOGoTNEFMailBodyPart */ diff --git a/SoObjects/Mailer/product.plist b/SoObjects/Mailer/product.plist index 8a23f4d39..9419fd65a 100644 --- a/SoObjects/Mailer/product.plist +++ b/SoObjects/Mailer/product.plist @@ -59,7 +59,7 @@ SOGoMessageMailBodyPart = { superclass = "SOGoMailBodyPart"; }; - SOGoTnefMailBodyPart = { + SOGoTNEFMailBodyPart = { superclass = "SOGoMailBodyPart"; }; SOGoCalendarMailBodyPart = { diff --git a/UI/MailPartViewers/GNUmakefile b/UI/MailPartViewers/GNUmakefile index 95718038b..fa37ef703 100644 --- a/UI/MailPartViewers/GNUmakefile +++ b/UI/MailPartViewers/GNUmakefile @@ -25,7 +25,7 @@ MailPartViewers_OBJC_FILES += \ UIxMailPartAlternativeViewer.m \ UIxMailPartMessageViewer.m \ UIxMailPartICalViewer.m \ - UIxMailPartTnefViewer.m \ + UIxMailPartTNEFViewer.m \ \ UIxMailPartICalActions.m diff --git a/UI/MailPartViewers/UIxMailPartTnefViewer.h b/UI/MailPartViewers/UIxMailPartTNEFViewer.h similarity index 89% rename from UI/MailPartViewers/UIxMailPartTnefViewer.h rename to UI/MailPartViewers/UIxMailPartTNEFViewer.h index bd48f6342..cfe4677cf 100644 --- a/UI/MailPartViewers/UIxMailPartTnefViewer.h +++ b/UI/MailPartViewers/UIxMailPartTNEFViewer.h @@ -1,4 +1,4 @@ -/* UIxMailPartTnefViewer.h - this file is part of SOGo +/* UIxMailPartTNEFViewer.h - this file is part of SOGo * * Copyright (C) 2021 Inverse inc. * @@ -23,7 +23,7 @@ #import "UIxMailPartMixedViewer.h" -@interface UIxMailPartTnefViewer : UIxMailPartMixedViewer +@interface UIxMailPartTNEFViewer : UIxMailPartMixedViewer { } diff --git a/UI/MailPartViewers/UIxMailPartTnefViewer.m b/UI/MailPartViewers/UIxMailPartTNEFViewer.m similarity index 93% rename from UI/MailPartViewers/UIxMailPartTnefViewer.m rename to UI/MailPartViewers/UIxMailPartTNEFViewer.m index 3603e3205..9a98e91e8 100644 --- a/UI/MailPartViewers/UIxMailPartTnefViewer.m +++ b/UI/MailPartViewers/UIxMailPartTNEFViewer.m @@ -28,12 +28,12 @@ #import #import -#import +#import #import "UIxMailRenderingContext.h" -#import "UIxMailPartTnefViewer.h" +#import "UIxMailPartTNEFViewer.h" -@implementation UIxMailPartTnefViewer +@implementation UIxMailPartTNEFViewer - (void) _attachmentIdsFromBodyPart: (id) thePart @@ -84,10 +84,10 @@ NSArray *parts; NSInteger i, max; NSMutableArray *renderedParts; - SOGoTnefMailBodyPart *tnefPart; + SOGoTNEFMailBodyPart *tnefPart; id viewer, info; - tnefPart = (SOGoTnefMailBodyPart *)[self clientPart]; + tnefPart = (SOGoTNEFMailBodyPart *)[self clientPart]; parts = [[tnefPart bodyParts] parts]; max = [parts count]; renderedParts = [NSMutableArray arrayWithCapacity: max]; @@ -126,4 +126,4 @@ nil]; } -@end /* UIxMailPartTnefViewer */ +@end /* UIxMailPartTNEFViewer */ diff --git a/UI/MailPartViewers/UIxMailRenderingContext.m b/UI/MailPartViewers/UIxMailRenderingContext.m index 48a7c899e..6618f3321 100644 --- a/UI/MailPartViewers/UIxMailRenderingContext.m +++ b/UI/MailPartViewers/UIxMailRenderingContext.m @@ -176,7 +176,7 @@ static BOOL showNamedTextAttachmentsInline = NO; - (WOComponent *) tnefViewer { - return [viewer pageWithName: @"UIxMailPartTnefViewer"]; + return [viewer pageWithName: @"UIxMailPartTNEFViewer"]; } /* main viewer selection */