Fix memory leaks

git-svn-id: http://shortcutrecorder.googlecode.com/svn/trunk@25 95fa3068-9819-0410-9c96-7759cbfcbc6e

Author: andypotion

Source/SRCommon.m

@@ -173,6 +173,7 @@ unsigned int SRCocoaToCarbonFlags( unsigned int cocoaFlags )
 	UInt32              deadKeyState;
     OSStatus err = noErr;
     CFLocaleRef locale = CFLocaleCopyCurrent();
+	[(id)locale autorelease]; // Autorelease here so that it gets released no matter what
 
 	CFMutableStringRef resultString;
 
@@ -241,16 +242,14 @@ unsigned int SRCocoaToCarbonFlags( unsigned int cocoaFlags )
 		err = UCKeyTranslate( uchrData, (UInt16)keyCode, kUCKeyActionDisplay, modifiers, LMGetKbdType(), kUCKeyTranslateNoDeadKeysBit, &deadKeyState, maxStringLength, &actualStringLength, unicodeString );
 		CFStringRef temp = CFStringCreateWithCharacters(kCFAllocatorDefault, unicodeString, 1);
 		resultString = CFStringCreateMutableCopy(kCFAllocatorDefault, 0,temp);
-		if(temp)
+		if (temp)
 			CFRelease(temp);
 	}   
 	CFStringCapitalize(resultString, locale);
-	CFRelease(locale);
 
 	PUDNSLog(@"character: -%@-", (NSString *)resultString);
 
 	return (NSString *)resultString;
-	
 }
 
 #pragma mark Animation Easing
@@ -367,6 +366,7 @@ + (NSImage *)supportingImageWithName:(NSString *)name {
 //	NSLog(@"created customImageRep: %@", customImageRep);
 	NSImage *returnImage = [[NSImage alloc] initWithSize:size];
 	[returnImage addRepresentation:customImageRep];
+	[customImageRep release];
 	[returnImage setScalesWhenResized:YES];
 	[SRSharedImageCache setObject:returnImage forKey:name];
 
@@ -383,6 +383,7 @@ + (NSImage *)supportingImageWithName:(NSString *)name {
 //	NSLog(@"created customImageRepQDRPL: %@", customImageRepQDRPL);
 	NSImage *returnImageQDRPL = [[NSImage alloc] initWithSize:sizeQDRPL];
 	[returnImageQDRPL addRepresentation:customImageRepQDRPL];
+	[customImageRepQDRPL release];
 	[returnImageQDRPL setScalesWhenResized:YES];
 	[returnImageQDRPL setFlipped:YES];
 	NSData *tiffQDRPL = [returnImageQDRPL TIFFRepresentation];
@@ -439,6 +440,9 @@ + (void)_drawSRSnapback:(id)anNSCustomImageRep {
 
 	[bp fill];
 
+	[bp release];
+	[flip release];
+	[sh release];
 }
 
 + (NSValue *)_sizeSRRemoveShortcut {

Source/SRKeyCodeTransformer.m

@@ -182,6 +182,8 @@ - (id) transformedValue:(id)value
                               length,
                               &realLength,
                               chars);
+		
+		if ( err != noErr ) return nil;
 
 		NSString *keyString = [[NSString stringWithCharacters:chars length:1] uppercaseString];
 

Source/SRRecorderCell.m

@@ -377,15 +377,13 @@ - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
 			isVaguelyRecording = YES;
 		}
 
-//	NSAffineTransform *transitionMovement = [[NSAffineTransform alloc] init];
-		NSAffineTransform *viewportMovement = [[NSAffineTransform alloc] init];
-		CTGradient *currRecordingGradient = [recordingGradient gradientWithAlphaComponent:0.3];
+//	NSAffineTransform *transitionMovement = [NSAffineTransform transform];
+		NSAffineTransform *viewportMovement = [NSAffineTransform transform];
 	// Draw gradient when in recording mode
 		if (isVaguelyRecording)
 		{
 			if (isAnimatingNow) {
 //			[transitionMovement translateXBy:(isAnimatingTowardsRecording ? -(NSWidth(cellFrame)*(1.0-xanim)) : +(NSWidth(cellFrame)*xanim)) yBy:0.0];
-				currRecordingGradient = [currRecordingGradient gradientWithAlphaComponent:alphaRecording];
 				if (SRAnimationAxisIsY) {
 //				[viewportMovement translateXBy:0.0 yBy:(isAnimatingTowardsRecording ? -(NSHeight(cellFrame)*(xanim)) : -(NSHeight(cellFrame)*(1.0-xanim)))];
 					[viewportMovement translateXBy:0.0 yBy:(isAnimatingTowardsRecording ? NSHeight(cellFrame)*(xanim) : NSHeight(cellFrame)*(1.0-xanim))];
@@ -413,11 +411,6 @@ - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
 
 //	if (isVaguelyRecording) 
 		{
-			roundedRect = [viewportMovement transformBezierPath:[NSBezierPath bezierPathWithSRCRoundRectInRect:SRAnimationOffsetRect(cellFrame,cellFrame) radius:NSHeight(cellFrame)/2.0]];
-			
-		// Fill background with gradient
-		//		[currRecordingGradient fillRect:cellFrame angle:90.0];
-			
 			NSRect snapBackRect = SRAnimationOffsetRect([self _snapbackRectForFrame: cellFrame],cellFrame);
 //		NSLog(@"snapbackrect: %@; offset: %@", NSStringFromRect([self _snapbackRectForFrame: cellFrame]), NSStringFromRect(snapBackRect));
 			NSPoint correctedSnapBackOrigin = [viewportMovement transformPoint:snapBackRect.origin];
@@ -647,7 +640,7 @@ - (void)mouseExited:(NSEvent*)theEvent
 - (BOOL)trackMouse:(NSEvent *)theEvent inRect:(NSRect)cellFrame ofView:(SRRecorderControl *)controlView untilMouseUp:(BOOL)flag
 {		
 	NSEvent *currentEvent = theEvent;
-	NSPoint mouseLocation = [controlView convertPoint:[currentEvent locationInWindow] fromView:nil];
+	NSPoint mouseLocation;
 
 	NSRect trackingRect = (isRecording ? [self _snapbackRectForFrame: cellFrame] : [self _removeButtonRectForFrame: cellFrame]);
 	NSRect leftRect = cellFrame;
@@ -1192,13 +1185,11 @@ - (void)_saveKeyCombo
 
 		if (hasKeyChars) {
 
-			NSMutableDictionary *mutableDefaultsValue = [defaultsValue mutableCopy];
+			NSMutableDictionary *mutableDefaultsValue = [[defaultsValue mutableCopy] autorelease];
 			[mutableDefaultsValue setObject:keyChars forKey:@"keyChars"];
 			[mutableDefaultsValue setObject:keyCharsIgnoringModifiers forKey:@"keyCharsIgnoringModifiers"];
 
-			defaultsValue = [mutableDefaultsValue copy];
-			[mutableDefaultsValue release];
-			
+			defaultsValue = mutableDefaultsValue;
 		}
 
 		[values setValue:defaultsValue forKey:[self _defaultsKeyForAutosaveName: defaultsKey]];

Source/SRValidator.m

@@ -242,7 +242,7 @@ - (id) delegate
 
 - (void) setDelegate: (id) theDelegate
 {
-    delegate = [theDelegate retain];
+    delegate = theDelegate; // Standard delegate pattern does not retain the delegate
 }
 
 @end