MacGui: Don't call "return" at the end of a void function.. .. Redux!

- As Per https://reviews.handbrake.fr/r/122/
- Thanks blindjimmy for the patche(s).
- Borked commit notes courtesy of me.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4058 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/HBAudio.m b/macosx/HBAudio.m
index f40f9e31b78f8cab27250bda1dd10deafbde0616..706e8303b9b7330cf43c38cfd436fe9bb16df18c 100644 (file)
--- a/macosx/HBAudio.m
+++ b/macosx/HBAudio.m
@@ -198,7 +198,6 @@ static NSMutableArray *masterBitRateArray = nil;
 
         [pool release];
     }
-    return;
 }
 
 // Ensure the list of codecs is accurate
@@ -268,8 +267,6 @@ static NSMutableArray *masterBitRateArray = nil;
             [self setCodec: nil];
         }
     }
-
-    return;
 }
 
 - (void) updateMixdowns: (BOOL) shouldSetDefault
@@ -337,8 +334,6 @@ static NSMutableArray *masterBitRateArray = nil;
     {
         [self setMixdown: [permittedMixdowns lastObject]];
     }
-
-    return;
 }
 
 - (void) updateBitRates: (BOOL) shouldSetDefault
@@ -425,8 +420,6 @@ static NSMutableArray *masterBitRateArray = nil;
     {
         [self setBitRate: [permittedBitRates lastObject]];
     }
-
-    return;
 }
 
 - (id) init
@@ -485,7 +478,6 @@ static NSMutableArray *masterBitRateArray = nil;
     [self setMixdowns: nil];
     [self setBitRates: nil];
     [super dealloc];
-    return;
 }
 
 #pragma mark -
@@ -532,7 +524,6 @@ static NSMutableArray *masterBitRateArray = nil;
     {
         [self updateBitRates: NO];
     }
-    return;
 }
 
 #pragma mark -
@@ -566,7 +557,6 @@ static NSMutableArray *masterBitRateArray = nil;
     {
         [self setMixdown: dict];
     }
-    return;
 }
 
 - (void) setSampleRateFromName: (NSString *) aValue
@@ -578,7 +568,6 @@ static NSMutableArray *masterBitRateArray = nil;
     {
         [self setSampleRate: dict];
     }
-    return;
 }
 
 - (void) setBitRateFromName: (NSString *) aValue
@@ -590,7 +579,6 @@ static NSMutableArray *masterBitRateArray = nil;
     {
         [self setBitRate: dict];
     }
-    return;
 }
 
 

diff --git a/macosx/HBAudioController.m b/macosx/HBAudioController.m
index 0e0b835c08dc7443cc88425ded005fa85fd8331c..cab0a3df09c1a79ecd51b894b0956d40b1f627c5 100644 (file)
--- a/macosx/HBAudioController.m
+++ b/macosx/HBAudioController.m
@@ -55,7 +55,6 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
     [audioArray release];
     [self setVideoContainerTag: nil];
     [super dealloc];
-    return;
 }
 
 - (void) setHBController: (id) aController
@@ -67,7 +66,6 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
     /* register that we are interested in changes made to the video container */
     [center addObserver: self selector: @selector(containerChanged:) name: HBContainerChangedNotification object: aController];
     [center addObserver: self selector: @selector(titleChanged:) name: HBTitleChangedNotification object: aController];
-    return;
 }
 
 - (void) _clearAudioArray
@@ -77,7 +75,6 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
     {
         [self removeObjectFromAudioArrayAtIndex: 0];
     }
-    return;
 }
 
 #pragma mark -
@@ -133,7 +130,6 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
             [aDict setObject: [[anAudio bitRate] objectForKey: keyAudioBitrate] forKey: [prefix stringByAppendingString: @"Bitrate"]];
         }
     }
-    return;
 }
 
 - (void) prepareAudioForJob: (hb_job_t *) aJob
@@ -177,7 +173,6 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
             free(audio);
         }
     }
-    return;
 }
 
 - (void) prepareAudioForPreset: (NSMutableArray *) anArray
@@ -204,7 +199,6 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
             [dict release];
         }
     }
-    return;
 }
 
 - (void) addTracksFromQueue: (NSMutableDictionary *) aQueue
@@ -241,8 +235,6 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
     }
 
     [self switchingTrackFromNone: nil]; // see if we need to add one to the list
-
-    return;
 }
 
 // This routine takes the preset and will return the value for the key AudioList
@@ -344,7 +336,6 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
             [newAudio release];
         }
     }
-    return;
 }
 
 // This matches the FIRST track with the specified prefix, otherwise it uses the defaultIfNotFound value
@@ -415,8 +406,6 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
             }
         }
     }
-
-    return;
 }
 
 - (void) _ensureAtLeastOneNonEmptyTrackExists
@@ -428,7 +417,6 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
         [self addTracksFromPreset: [self _defaultPreset] allTracks: NO];
     }
     [self switchingTrackFromNone: nil]; // this ensures there is a None track at the end of the list
-    return;
 }
 
 - (void) addTracksFromPreset: (NSMutableDictionary *) aPreset
@@ -436,7 +424,6 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
 {
     [self addTracksFromPreset: aPreset allTracks: NO];
     [self _ensureAtLeastOneNonEmptyTrackExists];
-    return;
 }
 
 - (void) addAllTracksFromPreset: (NSMutableDictionary *) aPreset
@@ -444,7 +431,6 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
 {
     [self addTracksFromPreset: aPreset allTracks: YES];
     [self _ensureAtLeastOneNonEmptyTrackExists];
-    return;
 }
 
 - (BOOL) anyCodecMatches: (int) aCodecValue
@@ -474,7 +460,6 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
     [newAudio setDrc: [NSNumber numberWithFloat: 0.0]];
     [newAudio setGain: [NSNumber numberWithFloat: 0.0]];
     [newAudio release];
-    return;
 }
 
 #pragma mark -
@@ -493,7 +478,6 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
         [self removeObjectFromAudioArrayAtIndex: index];
     }
     [self switchingTrackFromNone: nil]; // see if we need to add one to the list
-    return;
 }
 
 - (void) switchingTrackFromNone: (HBAudio *) noLongerNoneTrack
@@ -524,7 +508,6 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
     {
         [self addNewAudioTrack];
     }
-    return;
 }
 
 // This gets called whenever the video container changes.
@@ -543,7 +526,6 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
     {
         [audioObject setVideoContainerTag: [self videoContainerTag]];
     }
-    return;
 }
 
 - (void) titleChanged: (NSNotification *) aNotification
@@ -591,7 +573,6 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
     {
         [self _ensureAtLeastOneNonEmptyTrackExists];
     }
-    return;
 }
 
 #pragma mark -
@@ -613,14 +594,12 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
 
 {
     [audioArray insertObject: audioObject atIndex: index];
-    return;
 }
 
 - (void) removeObjectFromAudioArrayAtIndex: (unsigned int) index
 
 {
     [audioArray removeObjectAtIndex: index];
-    return;
 }
 
 @end