OS X: minor code changes and improvements.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@90607 e17a0e51-4ae3-4d35-97c3-1a29b211df97

4 files changed, 18 insertions, 11 deletions

diff --git a/macosx/PcsxrMemCardArray.m b/macosx/PcsxrMemCardArray.m
index 3570b74c..57de81ae 100644
--- a/macosx/PcsxrMemCardArray.m
+++ b/macosx/PcsxrMemCardArray.m
@@ -97,8 +97,7 @@ static inline void ClearMemcardData(char *to, int dsti, char *str)
 	if (self = [super init]) {
 		NSMutableArray *tmpMemArray = [[NSMutableArray alloc] initWithCapacity:MAX_MEMCARD_BLOCKS];
 		cardNumber = carNum;
-		int i, x;
-		i = 0;
+		int i = 0, x;
 		while (i < MAX_MEMCARD_BLOCKS) {
 			x = 1;
 			McdBlock memBlock;
@@ -202,7 +201,7 @@ static inline void ClearMemcardData(char *to, int dsti, char *str)
 	
 	int memIdx = tmpObj.startingIndex;
 	for (int i = 0; i < memSize; i++) {
-		CopyMemcardData([self memDataPtr], [otherCard memDataPtr], (memIdx+i), (toCopy+i), (char*)otherCard.memCardCPath);
+		CopyMemcardData([self memDataPtr], [otherCard memDataPtr], memIdx + i, toCopy + i, (char*)otherCard.memCardCPath);
 	}
 	
 	return YES;
@@ -275,18 +274,18 @@ static inline void ClearMemcardData(char *to, int dsti, char *str)
 		
 		if (theFlags == memFlagDeleted || theFlags == memFlagFree) {
 			PCSXRMemFlags up1Flags = theFlags;
-			while ((up1Flags == memFlagDeleted || up1Flags == memFlagFree) && x < MAX_MEMCARD_BLOCKS){
+			while ((up1Flags == memFlagDeleted || up1Flags == memFlagFree) && x < MAX_MEMCARD_BLOCKS) {
 				x++;
 				McdBlock up1Block;
 				GetMcdBlockInfo(cardNumber, x+1, &up1Block);
 				up1Flags = [PcsxrMemoryObject memFlagsFromBlockFlags:up1Block.Flags];
 			}
 			if (x >= MAX_MEMCARD_BLOCKS) {
-				
 				break;
 			}
+			
 			CopyMemcardData(self.memDataPtr, self.memDataPtr, x, i, (char*)[[self.memCardURL path] fileSystemRepresentation]);
-			ClearMemcardData(self.memDataPtr, x, (char*)self.memCardCPath );
+			ClearMemcardData(self.memDataPtr, x, (char*)self.memCardCPath);
 		}
 		i++;
 	}
@@ -322,7 +321,7 @@ static inline void ClearMemcardData(char *to, int dsti, char *str)
 	
 	McdBlock flagBlock;
 	
-	for(i = theObj.startingIndex +1; i < (theObj.startingIndex + theObj.blockSize +1); i++)
+	for(i = theObj.startingIndex + 1; i < (theObj.startingIndex + theObj.blockSize + 1); i++)
 	{
 		GetMcdBlockInfo(cardNumber, i, &flagBlock);
 		ptr = data + i * 128;
diff --git a/macosx/Psx-Memcard/GetMetadataForFile.m b/macosx/Psx-Memcard/GetMetadataForFile.m
index ed0e8dd3..19e00cc0 100644
--- a/macosx/Psx-Memcard/GetMetadataForFile.m
+++ b/macosx/Psx-Memcard/GetMetadataForFile.m
@@ -224,6 +224,7 @@ Boolean GetMetadataForFile(void *thisInterface, CFMutableDictionaryRef attribute
 		attr[kPCSXRFreeBlocks] = @(freeBlocks);
 		attr[kPCSXRMemNames] = [memNames copy];
 		attr[kPCSXRMemIDs] = [memIDs copy];
+		ok = TRUE;
 	}
     
 	// Return the status
diff --git a/macosx/hotkeys.m b/macosx/hotkeys.m
index 497c1c53..70e3ae15 100755
--- a/macosx/hotkeys.m
+++ b/macosx/hotkeys.m
@@ -18,7 +18,8 @@ static id monitor;
 static id gpuMonitor;
 static int currentState = 0;
 static NSMutableDictionary *hotkeys = nil;
-enum {
+
+typedef NS_ENUM(int, PCSXR_HotKey) {
     HK_FAST_FORWARD,
     HK_SAVE_STATE,
     HK_LOAD_STATE,
@@ -53,28 +54,35 @@ BOOL handleHotkey(NSString* keyCode) {
                         GPU_keypressed(GPU_FAST_FORWARD);
                     }
                     break;
+					
                 case HK_FRAME_LIMIT:
                     // Ignore FrameLimit requests if paused
                     if(![EmuThread isPaused]) {
                         GPU_keypressed(GPU_FRAME_LIMIT);
                     }
                     break;
+					
                 case HK_SAVE_STATE:
                     [PcsxrController saveState:currentState];
                     break;
+					
                 case HK_LOAD_STATE:
                     [PcsxrController loadState:currentState];
                     break;
+					
                 case HK_NEXT_STATE:
                     nextState();
                     GPU_displayText((char*)[[NSString stringWithFormat:@"State Slot: %d", currentState] UTF8String]);
                     break;
+					
                 case HK_PREV_STATE:
                     prevState();
                     GPU_displayText((char*)[[NSString stringWithFormat:@"State Slot: %d", currentState] UTF8String]);
                     break;
+					
                 default:
                     NSLog(@"Invalid hotkey identifier %i.", [ident intValue]);
+					break;
             }
         
             return YES;
@@ -84,7 +92,7 @@ BOOL handleHotkey(NSString* keyCode) {
     return NO;
 }
 
-void setupHotkey(int hk, NSString *label, NSDictionary *binding) {
+void setupHotkey(PCSXR_HotKey hk, NSString *label, NSDictionary *binding) {
 	if(binding != nil)
 		hotkeys[binding[@"keyCode"]] = @(hk);
 }
diff --git a/macosx/main.m b/macosx/main.m
index ec00387f..33f74908 100755
--- a/macosx/main.m
+++ b/macosx/main.m
@@ -305,8 +305,7 @@ void OnFile_Exit()
 
 char* Pcsxr_locale_text(char* toloc)
 {
-	NSBundle *mainBundle = [NSBundle mainBundle];
 	NSString *origString = @(toloc), *transString = nil;
-	transString = [mainBundle localizedStringForKey:origString value:@"" table:nil];
+	transString = [[NSBundle mainBundle] localizedStringForKey:origString value:@"" table:nil];
 	return (char*)[transString UTF8String];
 }