hedgewars: comparison project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m

equal deleted inserted replaced

-:2c06b1120749
+:00215a7ec5f5
 @implementation SingleSchemeViewController
 @synthesize schemeName, schemeDictionary, basicSettingList, gameModifierArray;
--(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation {
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
 return rotationManager(interfaceOrientation);
 }
 #pragma mark -
 #pragma mark View lifecycle
--(void) viewDidLoad {
+- (void)viewDidLoad {
 [super viewDidLoad];
 // title, description, image name (+btn)
 NSArray *mods = [[NSArray alloc] initWithContentsOfFile:GAMEMODS_FILE()];
 self.gameModifierArray = mods;
-[mods release];
 // title, image name (+icon), default value, max value, min value
 NSArray *basicSettings = [[NSArray alloc] initWithContentsOfFile:BASICFLAGS_FILE()];
 self.basicSettingList = basicSettings;
-[basicSettings release];
 self.title = NSLocalizedString(@"Edit scheme preferences",@"");
 }
 // load from file
--(void) viewWillAppear:(BOOL) animated {
+- (void)viewWillAppear:(BOOL) animated {
 [super viewWillAppear:animated];
 NSString *schemeFile = [[NSString alloc] initWithFormat:@"%@/%@.plist",SCHEMES_DIRECTORY(),self.schemeName];
 NSMutableDictionary *scheme = [[NSMutableDictionary alloc] initWithContentsOfFile:schemeFile];
-[schemeFile release];
 self.schemeDictionary = scheme;
-[scheme release];
 [self.tableView reloadData];
 }
 // save to file
--(void) viewWillDisappear:(BOOL) animated {
+- (void)viewWillDisappear:(BOOL) animated {
 [super viewWillDisappear:animated];
 NSString *schemeFile = [[NSString alloc] initWithFormat:@"%@/%@.plist",SCHEMES_DIRECTORY(),self.schemeName];
 [self.schemeDictionary writeToFile:schemeFile atomically:YES];
-[schemeFile release];
 }
 // force a redraw of the game mod section to reposition the slider
--(void) willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
+- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
 if (IS_IPAD() == NO)
 return;
 [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:1] withRowAnimation:UITableViewRowAnimationFade];
 }
 #pragma mark -
 #pragma mark editableCellView delegate
 // set the new value
--(void) saveTextFieldValue:(NSString *)textString withTag:(NSInteger) tagValue {
+- (void)saveTextFieldValue:(NSString *)textString withTag:(NSInteger)tagValue {
 if (tagValue == 0) {
 // delete old file
 [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@/%@.plist",SCHEMES_DIRECTORY(),self.schemeName] error:NULL];
 // update filename
 self.schemeName = textString;
 }
 }
 #pragma mark -
 #pragma mark Table view data source
--(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
 return 3;
 }
--(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
 switch (section) {
 case 0:
 return 2;
 break;
 case 1:
 UITableViewCell *cell = nil;
 EditableCellView *editableCell = nil;
 NSInteger row = [indexPath row];
 switch ([indexPath section]) {
-case 0:
+case 0: {
 editableCell = (EditableCellView *)[aTableView dequeueReusableCellWithIdentifier:CellIdentifier0];
 if (editableCell == nil) {
-editableCell = [[[EditableCellView alloc] initWithStyle:UITableViewCellStyleDefault
+editableCell = [[EditableCellView alloc] initWithStyle:UITableViewCellStyleDefault
-reuseIdentifier:CellIdentifier0] autorelease];
+reuseIdentifier:CellIdentifier0];
 editableCell.delegate = self;
 }
 editableCell.tag = row;
 editableCell.selectionStyle = UITableViewCellSelectionStyleNone;
 editableCell.imageView.image = nil;
 editableCell.textField.text = [self.schemeDictionary objectForKey:@"description"];
 editableCell.textField.placeholder = NSLocalizedString(@"You can add a description if you wish",@"");
 }
 cell = editableCell;
 break;
-case 1:
+}
+case 1: {
 cell = [aTableView dequeueReusableCellWithIdentifier:CellIdentifier1];
 NSDictionary *detail = [self.basicSettingList objectAtIndex:row];
 // need to offset this section (see format in CommodityFunctions.m and above)
 if (cell == nil) {
-cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1
+cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1
-reuseIdentifier:CellIdentifier1] autorelease];
+reuseIdentifier:CellIdentifier1];
 UISlider *slider = [[UISlider alloc] init];
 [slider addTarget:self action:@selector(sliderChanged:) forControlEvents:UIControlEventValueChanged];
 [cell.contentView addSubview:slider];
-[slider release];
 UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(50, 7, 200, 30)];
 label.tag = LABEL_TAG;
 label.backgroundColor = [UIColor clearColor];
 label.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize]];
 [cell.contentView addSubview:label];
-[label release];
 }
 UIImage *img = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/icon%@.png",ICONS_DIRECTORY(),
 [[self.basicSettingList objectAtIndex:row] objectForKey:@"image"]]];
 cell.imageView.image = img;
-[img release];
 UILabel *cellLabel = (UILabel *)[cell.contentView viewWithTag:LABEL_TAG];
 NSString *basicSettingTitleKey = [[self.basicSettingList objectAtIndex:row] objectForKey:@"title"];
 cellLabel.text = NSLocalizedStringFromTable(basicSettingTitleKey, @"Scheme", nil);
 cellLabel.adjustsFontSizeToFitWidth = YES;
 prestring = [NSString stringWithFormat:@" %@",prestring];
 cell.detailTextLabel.text = prestring;
 cell.selectionStyle = UITableViewCellSelectionStyleBlue;
 break;
-case 2:
+}
+case 2: {
 cell = [aTableView dequeueReusableCellWithIdentifier:CellIdentifier2];
 if (cell == nil) {
-cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle
+cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle
-reuseIdentifier:CellIdentifier2] autorelease];
+reuseIdentifier:CellIdentifier2];
 UISwitch *onOff = [[UISwitch alloc] init];
 [onOff addTarget:self action:@selector(toggleSwitch:) forControlEvents:UIControlEventValueChanged];
 cell.accessoryView = onOff;
-[onOff release];
 }
 UISwitch *switcher = (UISwitch *)cell.accessoryView;
 switcher.tag = SWITCH_TAG + row;
 [switcher setOn:[[[self.schemeDictionary objectForKey:@"gamemod"] objectAtIndex:row] boolValue] animated:NO];
 UIImage *image = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/btn%@.png",ICONS_DIRECTORY(),
 [[self.gameModifierArray objectAtIndex:row] objectForKey:@"image"]]];
 cell.imageView.image = image;
-[image release];
 cell.imageView.layer.cornerRadius = 6.0f;
 cell.imageView.layer.masksToBounds = YES;
 NSString *gameModTitleKey = [[self.gameModifierArray objectAtIndex:row] objectForKey:@"title"];
 cell.textLabel.text = NSLocalizedStringFromTable(gameModTitleKey, @"Scheme", nil);
 NSString *gameModDescKey = [[self.gameModifierArray objectAtIndex:row] objectForKey:@"description"];
 cell.detailTextLabel.adjustsFontSizeToFitWidth = YES;
 cell.detailTextLabel.minimumFontSize = 6;
 cell.selectionStyle = UITableViewCellSelectionStyleNone;
 }
+}
 return cell;
 }
--(void) toggleSwitch:(id) sender {
+- (void)toggleSwitch:(id)sender {
 UISwitch *theSwitch = (UISwitch *)sender;
 NSMutableArray *array = [self.schemeDictionary objectForKey:@"gamemod"];
 [array replaceObjectAtIndex:theSwitch.tag-SWITCH_TAG withObject:[NSNumber numberWithBool:theSwitch.on]];
 }
--(void) sliderChanged:(id) sender {
+- (void)sliderChanged:(id)sender {
 // the slider that changed is sent as object
 UISlider *theSlider = (UISlider *)sender;
 // create the indexPath of the row of the slider
 NSIndexPath *indexPath = [NSIndexPath indexPathForRow:theSlider.tag-SLIDER_TAG inSection:1];
 // get its cell
 [array replaceObjectAtIndex:theSlider.tag-SLIDER_TAG withObject:[NSNumber numberWithInteger:theSlider.value]];
 }
 #pragma mark -
 #pragma mark Table view delegate
--(void) tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+- (void)tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
 UITableViewCell *cell = [aTableView cellForRowAtIndexPath:indexPath];
 EditableCellView *editableCell = nil;
 UISlider *cellSlider = nil;
 switch ([indexPath section]) {
 return [NSString stringWithFormat:@"%ld", (long)sliderValue];
 }
 #pragma mark -
 #pragma mark Memory management
--(void) didReceiveMemoryWarning {
+- (void)didReceiveMemoryWarning {
 [super didReceiveMemoryWarning];
 self.basicSettingList = nil;
 self.gameModifierArray = nil;
 }
--(void) viewDidUnload {
-self.schemeName = nil;
-self.schemeDictionary = nil;
-self.basicSettingList = nil;
-self.gameModifierArray = nil;
-MSG_DIDUNLOAD();
-[super viewDidUnload];
-}
--(void) dealloc {
-releaseAndNil(schemeName);
-releaseAndNil(schemeDictionary);
-releaseAndNil(basicSettingList);
-releaseAndNil(gameModifierArray);
-[super dealloc];
-}
 @end

branch	ios-develop
changeset 12872	00215a7ec5f5
parent 11292	83738cdd750d
child 13166	ba5c794adae3