Converted to Objective-C ARC

ReplyWithHeader.xcodeproj/project.pbxproj

@@ -442,6 +442,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -460,6 +461,7 @@
 					dynamic_lookup,
 				);
 				PRODUCT_NAME = ReplyWithHeader;
+				SDKROOT = macosx;
 				STRIP_STYLE = "non-global";
 				WRAPPER_EXTENSION = mailbundle;
 				ZERO_LINK = YES;
@@ -470,6 +472,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -487,6 +490,7 @@
 					dynamic_lookup,
 				);
 				PRODUCT_NAME = ReplyWithHeader;
+				SDKROOT = macosx;
 				STRIP_STYLE = "non-global";
 				WRAPPER_EXTENSION = mailbundle;
 			};

ReplyWithHeader/MHHeaderString.h

@@ -51,6 +51,5 @@
 - (WebArchive *)getWebArchive;
 - (int)getHeaderItemCount;
 - (BOOL)isSuppressLabelsFound;
-- (void)dealloc;
 
 @end

ReplyWithHeader/MHHeaderString.m

@@ -141,28 +141,15 @@ - (NSString *)stringValue
     return headerString.string;
 }
 
-- (void)dealloc
-{
-    headerString = nil;
-    headerItemCount = nil;
-    isSuppressLabelsFound = nil;
-
-    free(headerString);
-    free(headerItemCount);
-    free(isSuppressLabelsFound);
-
-    [super dealloc];
-}
-
 - (id)initWithMailMessage:(id)mailMessage
 {
     if (self = [super init])
     {
-        [self init];
+        if (!(self = [self init])) return nil;
 
         //initialze the value with a mutable copy of the attributed string
         headerString = [[[mailMessage originalMessageHeaders]
-                         attributedStringShowingHeaderDetailLevel:1] mutableCopy];
+                         attributedStringShowingHeaderDetailLevel:[NSNumber numberWithInt:1]] mutableCopy];
 
         // let's things going
         [self fixHeaderString];
@@ -224,7 +211,7 @@ - (void)suppressImplicateHeaderLabels
     {
         isSuppressLabelsFound = YES;
 
-        NSAttributedString *replaceString = [[[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@""]] autorelease];
+        NSAttributedString *replaceString = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@""]];
         [headerString
          replaceCharactersInRange:NSMakeRange(range.location, ([headerString length] - range.location)) withAttributedString:replaceString];
     }
@@ -246,15 +233,15 @@ - (void)applyHeaderOrderChange
                                     attributedSubstringFromRange:NSMakeRange([headerString length] - 1, 1)];
         if (![[last string] isEqualToString:@"\n"])
         {
-            NSAttributedString *newLine = [[[NSAttributedString alloc] initWithString:@"\n"] autorelease];
+            NSAttributedString *newLine = [[NSAttributedString alloc] initWithString:@"\n"];
             [headerString appendAttributedString:newLine];
         }
 
         // Subject: relocation
         [headerString appendAttributedString:subAttStr];
 
         // removal of old Subject:
-        NSAttributedString *replaceString = [[[NSAttributedString alloc] initWithString:@""] autorelease];
+        NSAttributedString *replaceString = [[NSAttributedString alloc] initWithString:@""];
         [headerString replaceCharactersInRange:subCntRange withAttributedString:replaceString];
     }
 }
@@ -284,12 +271,12 @@ - (void)applyHeaderLabelChange
         // captureing from email id for mailto:
         NSString *emailId = [headerString.string substringWithRange:range];
         // handling of mailto: for From: tag
-        NSMutableAttributedString *fromMailId = [[[NSMutableAttributedString alloc]
-                                                  initWithString:emailId] autorelease];
+        NSMutableAttributedString *fromMailId = [[NSMutableAttributedString alloc]
+                                                  initWithString:emailId];
         [fromMailId replaceCharactersInRange:NSMakeRange(0, 2) withString:@" [mailto:"];
         [fromMailId replaceCharactersInRange:NSMakeRange(fromMailId.length - 1, 1) withString:@"]"];
 
-        NSAttributedString *emlRplStr = [[[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@";"]] autorelease];
+        NSAttributedString *emlRplStr = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@";"]];
         while (range.length != 0)
         {
             [headerString replaceCharactersInRange:range withAttributedString:emlRplStr];

ReplyWithHeader/MHHeadersEditor.m

@@ -65,8 +65,6 @@ - (void)MHLoadHeadersFromBackEnd:(id)arg1
 
         // cascading subject text change
         [self _subjectChanged];
-
-        CLEAN(subjectText);
     }    
 }
 

ReplyWithHeader/MHMessage.m

@@ -31,7 +31,7 @@
 #import "MHHeaderString.h"
 
 @interface MHMessage (MHNoImplementation)
-- (id)type;
+- (int)type;
 @end
 
 @implementation MHMessage
@@ -56,10 +56,6 @@ - (void)MH_continueToSetupContentsForView:(id)arg1 withParsedMessages:(id)arg2
 
         //insert the new header text
         [quotedText insertMailHeader:newheaderString msgComposeType:msgCompose];
-
-        // once done recycle it
-        CLEAN(newheaderString);
-        CLEAN(quotedText);
     }
 }
 

ReplyWithHeader/MHPreferences.m

@@ -139,8 +139,6 @@ - (IBAction)openFeedback:(id)sender
     [infoAlert runModal];
 
     [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://myjeeva.com/replywithheader#wp-comments"]];
-
-    CLEAN(infoAlert);
 }
 
 - (IBAction)openSupport:(id)sender
@@ -174,8 +172,6 @@ - (IBAction)notifyNewVersionPressed:(id)sender
 
             [_MHNotifyNewVersion setState:YES];
         }
-
-        CLEAN(alert);
     }    
 }
 

ReplyWithHeader/MHQuotedMailOriginal.m

@@ -32,12 +32,13 @@
 //
 //  MHQuotedMailOriginal Class refactored & completely rewritten by Jeevanandam M. on Sep 22, 2013
 
-#import "WebKit/DOMHTMLBRElement.h"
-#import "WebKit/DOMDocumentFragment.h"
-#import "WebKit/DOMHTMLDivElement.h"
-#import "WebKit/DOMHTMLDocument.h"
-#import "WebKit/DOMNodeList.h"
-#import "WebKit/DOMElement.h"
+#import <WebKit/DOMHTMLBRElement.h>
+#import <WebKit/DOMDocumentFragment.h>
+#import <WebKit/DOMHTMLDivElement.h>
+#import <WebKit/DOMHTMLDocument.h>
+#import <WebKit/DOMHTMLCollection.h>
+#import <WebKit/DOMNodeList.h>
+#import <WebKit/DOMElement.h>
 
 #import "MHQuotedMailOriginal.h"
 #import "MHHeaderString.h"

ReplyWithHeader/MHUpdater.m

@@ -99,19 +99,9 @@ - (id)init
         {
             MHLog(@"RWH new version availabilty check failed. May be internet connection unavailable.");
         }
-
-        CLEAN(appCastData);
     }
 
     return self;
 }
 
-- (void)dealloc
-{
-    CLEAN(comparator);
-    CLEAN(jsonDic);    
-    CLEAN(_alert);    
-    [super dealloc];
-}
-
 @end

ReplyWithHeader/MLog.m

@@ -40,8 +40,6 @@ + (void) logFile: (char *) sourceFile lineNumber: (int) lineNumber format: (NSSt
 	// NSLog handles synchronization issues
 	NSLog(@"%s: %d %@", [[file lastPathComponent] UTF8String], lineNumber, print);
 
-	[print release];
-	[file  release];
 
 	return;
 }

ReplyWithHeader/MailHeader_Prefix.pch

@@ -26,6 +26,4 @@
 #define GET_DEFAULT_INT(k) [[NSUserDefaults standardUserDefaults] integerForKey: k]
 #define SET_DEFAULT_INT(n,k)[[NSUserDefaults standardUserDefaults] setInteger: n forKey: k]
 
-#define MHLocalizedString(key) [MailHeader localizedString:(key)]
-
-#define CLEAN(o) { if(o) { [o release]; o = nil; } }
+#define MHLocalizedString(key) [MailHeader localizedString:(key)]

ReplyWithHeader/SUStandardVersionComparator.m

@@ -55,15 +55,15 @@ - (NSArray *)splitVersionString:(NSString *)version
         // Nothing to do here
         return parts;
     }
-    s = [[[version substringToIndex:1] mutableCopy] autorelease];
+    s = [[version substringToIndex:1] mutableCopy];
     oldType = [self typeOfCharacter:s];
     n = [version length] - 1;
     for (i = 1; i <= n; ++i) {
         character = [version substringWithRange:NSMakeRange(i, 1)];
         newType = [self typeOfCharacter:character];
         if (oldType != newType || oldType == kSeparatorType) {
             // We've reached a new segment
-			NSString *aPart = [[[NSString alloc] initWithString:s] autorelease];
+			NSString *aPart = [[NSString alloc] initWithString:s];
             [parts addObject:aPart];
             [s setString:character];
         } else {