diff --git a/apple/OSX/settings.m b/apple/OSX/settings.m index 4fdc3bfde7..2d96082fd8 100644 --- a/apple/OSX/settings.m +++ b/apple/OSX/settings.m @@ -60,13 +60,13 @@ static void* const associated_name_tag = (void*)&associated_name_tag; - (void)checkBind:(NSTimer*)send { int32_t value = 0; - int32_t index = self.setting->index ? self.setting->index - 1 : 0; + int32_t idx = self.setting->index ? self.setting->index - 1 : 0; if ((value = apple_input_find_any_key())) BINDFOR(*[self setting]).key = input_translate_keysym_to_rk(value); - else if ((value = apple_input_find_any_button(index)) >= 0) + else if ((value = apple_input_find_any_button(idx)) >= 0) BINDFOR(*[self setting]).joykey = value; - else if ((value = apple_input_find_any_axis(index))) + else if ((value = apple_input_find_any_axis(idx))) BINDFOR(*[self setting]).joyaxis = (value > 0) ? AXIS_POS(value - 1) : AXIS_NEG(abs(value) - 1); else return; @@ -211,9 +211,9 @@ NSWindowDelegate> return (item == nil) ? [self.currentGroup count] : [item count]; } -- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item +- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)idx ofItem:(id)item { - return (item == nil) ? [self.currentGroup objectAtIndex:index] : [item objectAtIndex:index]; + return (item == nil) ? [self.currentGroup objectAtIndex:idx] : [item objectAtIndex:idx]; } - (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item diff --git a/apple/iOS/browser.m b/apple/iOS/browser.m index bde80cea4c..f6d9f61a6d 100644 --- a/apple/iOS/browser.m +++ b/apple/iOS/browser.m @@ -306,11 +306,11 @@ static void file_action(enum file_action action, NSString* source, NSString* tar if (gesture.state == UIGestureRecognizerStateBegan) { CGPoint point = [gesture locationInView:self.tableView]; - NSIndexPath* indexPath = [self.tableView indexPathForRowAtPoint:point]; + NSIndexPath* idx_path = [self.tableView indexPathForRowAtPoint:point]; - if (indexPath) + if (idx_path) { - self.selectedItem = [self itemForIndexPath:indexPath]; + self.selectedItem = [self itemForIndexPath:idx_path]; bool is_zip = [[self.selectedItem.path pathExtension] isEqualToString:@"zip"]; NSString* button4_name = (IOS_IS_VERSION_7_OR_HIGHER()) ? @"AirDrop" : @"Delete"; diff --git a/apple/iOS/menu.m b/apple/iOS/menu.m index 2a42a695d4..dbd08f191b 100644 --- a/apple/iOS/menu.m +++ b/apple/iOS/menu.m @@ -501,16 +501,16 @@ static void RunActionSheet(const char* title, const struct string_list* items, U - (void)checkBind:(NSTimer*)send { int32_t value = 0; - int32_t index = 0; + int32_t idx = 0; if (self.setting->index) - index = self.setting->index - 1; + idx = self.setting->index - 1; if ((value = apple_input_find_any_key())) BINDFOR(*self.setting).key = input_translate_keysym_to_rk(value); - else if ((value = apple_input_find_any_button(index)) >= 0) + else if ((value = apple_input_find_any_button(idx)) >= 0) BINDFOR(*self.setting).joykey = value; - else if ((value = apple_input_find_any_axis(index))) + else if ((value = apple_input_find_any_axis(idx))) BINDFOR(*self.setting).joyaxis = (value > 0) ? AXIS_POS(value - 1) : AXIS_NEG(abs(value) - 1); else return; @@ -1062,12 +1062,12 @@ static bool copy_config(const char *src_path, const char *dst_path) return self; } -- (void)editValue:(uint32_t)index +- (void)editValue:(uint32_t)idx { RACoreOptionsMenu __weak* weakSelf = self; - self.currentIndex = index; + self.currentIndex = idx; - RunActionSheet(core_option_get_desc(g_extern.system.core_options, index), core_option_get_vals(g_extern.system.core_options, index), self.tableView, + RunActionSheet(core_option_get_desc(g_extern.system.core_options, idx), core_option_get_vals(g_extern.system.core_options, idx), self.tableView, ^(UIActionSheet* actionSheet, NSInteger buttonIndex) { if (buttonIndex != actionSheet.cancelButtonIndex)