# HG changeset patch # User antonc27 # Date 1520804380 -3600 # Node ID ba5c794adae31532d03df0bc05f63ecb8e2d3da4 # Parent eefd6d06676816a094bdc7d36adec8cd4464d28e - Some not-so-important pretty formatting diff -r eefd6d066768 -r ba5c794adae3 project_files/HedgewarsMobile/Classes/AboutViewController.m --- a/project_files/HedgewarsMobile/Classes/AboutViewController.m Sun Mar 11 20:43:15 2018 +0100 +++ b/project_files/HedgewarsMobile/Classes/AboutViewController.m Sun Mar 11 22:39:40 2018 +0100 @@ -106,7 +106,7 @@ // do nothing } --(CGFloat) tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section { +- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section { return 95; } diff -r eefd6d066768 -r ba5c794adae3 project_files/HedgewarsMobile/Classes/ExtraCategories.h --- a/project_files/HedgewarsMobile/Classes/ExtraCategories.h Sun Mar 11 20:43:15 2018 +0100 +++ b/project_files/HedgewarsMobile/Classes/ExtraCategories.h Sun Mar 11 22:39:40 2018 +0100 @@ -22,8 +22,8 @@ @interface UIScreen (safe) --(CGFloat) safeScale; --(CGRect) safeBounds; +- (CGFloat)safeScale; +- (CGRect)safeBounds; @end @@ -37,11 +37,11 @@ @interface UIColor (HWColors) -+(UIColor *)darkYellowColor; -+(UIColor *)lightYellowColor; -+(UIColor *)darkBlueColor; -+(UIColor *)darkBlueColorTransparent; -+(UIColor *)blackColorTransparent; ++ (UIColor *)darkYellowColor; ++ (UIColor *)lightYellowColor; ++ (UIColor *)darkBlueColor; ++ (UIColor *)darkBlueColorTransparent; ++ (UIColor *)blackColorTransparent; @end @@ -68,7 +68,7 @@ @interface NSString (MD5) --(NSString *)MD5hash; +- (NSString *)MD5hash; @end diff -r eefd6d066768 -r ba5c794adae3 project_files/HedgewarsMobile/Classes/ExtraCategories.m --- a/project_files/HedgewarsMobile/Classes/ExtraCategories.m Sun Mar 11 20:43:15 2018 +0100 +++ b/project_files/HedgewarsMobile/Classes/ExtraCategories.m Sun Mar 11 22:39:40 2018 +0100 @@ -25,14 +25,14 @@ #pragma mark - @implementation UIScreen (safe) --(CGFloat) safeScale { +- (CGFloat)safeScale { CGFloat theScale = 1.0f; // if ([self respondsToSelector:@selector(scale)]) // theScale = [self scale]; return theScale; } --(CGRect) safeBounds { +- (CGRect)safeBounds { return [self bounds]; // CGRect original = [self bounds]; // if (IS_ON_PORTRAIT()) @@ -63,27 +63,27 @@ #pragma mark - @implementation UIColor (HWColors) -+(UIColor *)darkYellowColor { ++ (UIColor *)darkYellowColor { return [UIColor colorWithRed:(CGFloat)0xFE/255 green:(CGFloat)0xC0/255 blue:0 alpha:1]; } -+(UIColor *)lightYellowColor { ++ (UIColor *)lightYellowColor { return [UIColor colorWithRed:(CGFloat)0xF0/255 green:(CGFloat)0xD0/255 blue:0 alpha:1]; } -+(UIColor *)darkBlueColor { ++ (UIColor *)darkBlueColor { return [UIColor colorWithRed:(CGFloat)0x0F/255 green:0 blue:(CGFloat)0x42/255 alpha:1]; } // older devices don't get any transparency for performance reasons -+(UIColor *)darkBlueColorTransparent { ++ (UIColor *)darkBlueColorTransparent { return [UIColor colorWithRed:(CGFloat)0x0F/255 green:0 blue:(CGFloat)0x55/255 alpha:IS_NOT_POWERFUL([HWUtils modelType]) ? 1 : 0.6f]; } -+(UIColor *)blackColorTransparent { ++ (UIColor *)blackColorTransparent { return [UIColor colorWithRed:0 green:0 blue:0 @@ -178,7 +178,7 @@ #pragma mark - @implementation NSString (MD5) --(NSString *)MD5hash { +- (NSString *)MD5hash { const char *cStr = [self UTF8String]; unsigned char result[16]; CC_MD5( cStr, strlen(cStr), result ); diff -r eefd6d066768 -r ba5c794adae3 project_files/HedgewarsMobile/Classes/FlagsViewController.m --- a/project_files/HedgewarsMobile/Classes/FlagsViewController.m Sun Mar 11 20:43:15 2018 +0100 +++ b/project_files/HedgewarsMobile/Classes/FlagsViewController.m Sun Mar 11 22:39:40 2018 +0100 @@ -107,7 +107,7 @@ return cell; } --(NSString *)tableView:(UITableView *)aTableView titleForHeaderInSection:(NSInteger)section { +- (NSString *)tableView:(UITableView *)aTableView titleForHeaderInSection:(NSInteger)section { NSString *sectionTitle = nil; switch (section) { case 0: diff -r eefd6d066768 -r ba5c794adae3 project_files/HedgewarsMobile/Classes/GeneralSettingsViewController.m --- a/project_files/HedgewarsMobile/Classes/GeneralSettingsViewController.m Sun Mar 11 20:43:15 2018 +0100 +++ b/project_files/HedgewarsMobile/Classes/GeneralSettingsViewController.m Sun Mar 11 22:39:40 2018 +0100 @@ -109,7 +109,7 @@ return 0; } --(NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section { +- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section { NSString *sectionTitle = nil; switch (section) { case 0: diff -r eefd6d066768 -r ba5c794adae3 project_files/HedgewarsMobile/Classes/MNEValueTrackingSlider.m --- a/project_files/HedgewarsMobile/Classes/MNEValueTrackingSlider.m Sun Mar 11 20:43:15 2018 +0100 +++ b/project_files/HedgewarsMobile/Classes/MNEValueTrackingSlider.m Sun Mar 11 22:39:40 2018 +0100 @@ -179,7 +179,7 @@ #pragma mark - #pragma mark Custom property accessors --(CGRect) thumbRect { +- (CGRect)thumbRect { CGRect trackRect = [self trackRectForBounds:self.bounds]; CGRect thumbR = [self thumbRectForBounds:self.bounds trackRect:trackRect diff -r eefd6d066768 -r ba5c794adae3 project_files/HedgewarsMobile/Classes/MissionTrainingViewController.m --- a/project_files/HedgewarsMobile/Classes/MissionTrainingViewController.m Sun Mar 11 20:43:15 2018 +0100 +++ b/project_files/HedgewarsMobile/Classes/MissionTrainingViewController.m Sun Mar 11 22:39:40 2018 +0100 @@ -200,7 +200,7 @@ return [self.listOfMissionIDs count]; } --(CGFloat) tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { +- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { return (IS_IPAD()) ? self.tableView.rowHeight : 80; } diff -r eefd6d066768 -r ba5c794adae3 project_files/HedgewarsMobile/Classes/SavedGamesViewController.m --- a/project_files/HedgewarsMobile/Classes/SavedGamesViewController.m Sun Mar 11 20:43:15 2018 +0100 +++ b/project_files/HedgewarsMobile/Classes/SavedGamesViewController.m Sun Mar 11 22:39:40 2018 +0100 @@ -150,7 +150,7 @@ return footer; } --(CGFloat) tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section { +- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section { return 60; } diff -r eefd6d066768 -r ba5c794adae3 project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m Sun Mar 11 20:43:15 2018 +0100 +++ b/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m Sun Mar 11 22:39:40 2018 +0100 @@ -35,25 +35,25 @@ #pragma mark - #pragma mark custom setters/getters --(NSString *)selectedScheme { +- (NSString *)selectedScheme { if (selectedScheme == nil) self.selectedScheme = @"Default.plist"; return selectedScheme; } --(NSString *)selectedWeapon { +- (NSString *)selectedWeapon { if (selectedWeapon == nil) self.selectedWeapon = @"Default.plist"; return selectedWeapon; } --(NSString *)selectedScript { +- (NSString *)selectedScript { if (selectedScript == nil) self.selectedScript = @""; return selectedScript; } --(NSString *)scriptCommand { +- (NSString *)scriptCommand { if (scriptCommand == nil) self.scriptCommand = @""; return scriptCommand; @@ -230,7 +230,7 @@ return cell; } --(CGFloat) tableView:(UITableView *)aTableView heightForHeaderInSection:(NSInteger)section { +- (CGFloat)tableView:(UITableView *)aTableView heightForHeaderInSection:(NSInteger)section { return IS_IPAD() ? 0 : 50; } @@ -246,7 +246,7 @@ return theView; } --(CGFloat) tableView:(UITableView *)aTableView heightForFooterInSection:(NSInteger)section { +- (CGFloat)tableView:(UITableView *)aTableView heightForFooterInSection:(NSInteger)section { return 40; } diff -r eefd6d066768 -r ba5c794adae3 project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m --- a/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m Sun Mar 11 20:43:15 2018 +0100 +++ b/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m Sun Mar 11 22:39:40 2018 +0100 @@ -300,7 +300,7 @@ [aTableView deselectRowAtIndexPath:indexPath animated:YES]; } --(NSString *)tableView:(UITableView *)aTableView titleForHeaderInSection:(NSInteger)section { +- (NSString *)tableView:(UITableView *)aTableView titleForHeaderInSection:(NSInteger)section { NSString *sectionTitle = nil; switch (section) { case 0: @@ -319,7 +319,7 @@ return sectionTitle; } --(CGFloat) tableView:(UITableView *)aTableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { +- (CGFloat)tableView:(UITableView *)aTableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { if ([indexPath section] == 0) return aTableView.rowHeight; else if ([indexPath section] == 1) diff -r eefd6d066768 -r ba5c794adae3 project_files/HedgewarsMobile/Classes/SingleTeamViewController.m --- a/project_files/HedgewarsMobile/Classes/SingleTeamViewController.m Sun Mar 11 20:43:15 2018 +0100 +++ b/project_files/HedgewarsMobile/Classes/SingleTeamViewController.m Sun Mar 11 22:39:40 2018 +0100 @@ -150,7 +150,7 @@ return rows; } --(NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section { +- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section { NSString *sectionTitle = nil; switch (section) { case 0: diff -r eefd6d066768 -r ba5c794adae3 project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m --- a/project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m Sun Mar 11 20:43:15 2018 +0100 +++ b/project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m Sun Mar 11 22:39:40 2018 +0100 @@ -183,14 +183,14 @@ return cell; } --(CGFloat) tableView:(UITableView *)aTableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { +- (CGFloat)tableView:(UITableView *)aTableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { if (0 == [indexPath section]) return aTableView.rowHeight; else return IS_ON_PORTRAIT() ? 208 : 120; } --(NSString *)tableView:(UITableView *)aTableView titleForHeaderInSection:(NSInteger)section { +- (NSString *)tableView:(UITableView *)aTableView titleForHeaderInSection:(NSInteger)section { NSString *sectionTitle = nil; switch (section) { case 0: diff -r eefd6d066768 -r ba5c794adae3 project_files/HedgewarsMobile/Classes/StatsPageViewController.m --- a/project_files/HedgewarsMobile/Classes/StatsPageViewController.m Sun Mar 11 20:43:15 2018 +0100 +++ b/project_files/HedgewarsMobile/Classes/StatsPageViewController.m Sun Mar 11 22:39:40 2018 +0100 @@ -126,7 +126,7 @@ return cell; } --(CGFloat) tableView:(UITableView *)aTableView heightForHeaderInSection:(NSInteger)section { +- (CGFloat)tableView:(UITableView *)aTableView heightForHeaderInSection:(NSInteger)section { return (section == 0) ? 160 : 40; } @@ -146,7 +146,7 @@ return nil; } --(CGFloat) tableView:(UITableView *)aTableView heightForFooterInSection:(NSInteger)section { +- (CGFloat)tableView:(UITableView *)aTableView heightForFooterInSection:(NSInteger)section { return aTableView.rowHeight + 30; } diff -r eefd6d066768 -r ba5c794adae3 project_files/HedgewarsMobile/Classes/SupportViewController.m --- a/project_files/HedgewarsMobile/Classes/SupportViewController.m Sun Mar 11 20:43:15 2018 +0100 +++ b/project_files/HedgewarsMobile/Classes/SupportViewController.m Sun Mar 11 22:39:40 2018 +0100 @@ -165,7 +165,7 @@ return nil; } --(CGFloat) tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section { +- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section { // image height + label height return (section == 1) ? 265 : 20; } diff -r eefd6d066768 -r ba5c794adae3 project_files/HedgewarsMobile/Classes/TeamConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Sun Mar 11 20:43:15 2018 +0100 +++ b/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Sun Mar 11 22:39:40 2018 +0100 @@ -165,7 +165,7 @@ return cell; } --(CGFloat) tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { +- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { return 45.0; } @@ -182,7 +182,7 @@ return theView; } --(CGFloat) tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section { +- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section { return IS_IPAD() ? 40 : 30; }