openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

remove some useless retain [part of commit 3af55e7d352e86e2bc5043f4cc6daa596ff0a9ac]

Browse Source
This commit is contained in:
C.W. Betts
2021-10-01 16:17:02 +02:00
committed by Celtic Minstrel
parent 77d5080435
commit 7ae29eeea3
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/game/boe.menus.mac.mm
View File

@@ -95,7 +95,7 @@ void adjust_monst_menu() {
static void setMenuCallback(NSMenuItem* item, id targ, SEL selector, int num) {
[item setTarget: targ];
[item setAction: selector];
[item setRepresentedObject: [[NSNumber numberWithInt: num] retain]];
[item setRepresentedObject: [NSNumber numberWithInt: num]];
}
void init_menubar() {
@@ -135,7 +135,7 @@ void init_menubar() {
eMenu::NONE, eMenu::HELP_HINTS, eMenu::HELP_SPELLS,
};
MenuHandler* handler = [[[MenuHandler alloc] init] retain];
MenuHandler* handler = [[MenuHandler alloc] init];
setMenuCallback([apple_menu itemWithTitle: @"About Blades of Exile"], handler, @selector(menuChoice:), int(eMenu::ABOUT));
setMenuCallback([apple_menu itemWithTitle: @"Preferences…"], handler, @selector(menuChoice:), int(eMenu::PREFS));
setMenuCallback([apple_menu itemWithTitle: @"Quit Blades of Exile"], handler, @selector(menuChoice:), int(eMenu::QUIT));
@@ -155,7 +155,6 @@ void init_menubar() {
i = 0;
for(eMenu opt : help_choices)
setMenuCallback([help_menu itemAtIndex: i++], handler, @selector(menuChoice:), int(opt));
i = 0;
setMenuCallback([mage_spells_menu itemAtIndex: 0], handler, @selector(menuChoice:), int(eMenu::ABOUT_MAGE));
setMenuCallback([priest_spells_menu itemAtIndex: 0], handler, @selector(menuChoice:), int(eMenu::ABOUT_PRIEST));

4
src/pcedit/pc.menus.mac.mm
View File

@@ -32,7 +32,7 @@ MenuHandle apple_menu, file_menu, reg_menu, extra_menu;
static void setMenuCallback(NSMenuItem* item, id targ, SEL selector, int num) {
[item setTarget: targ];
[item setAction: selector];
[item setRepresentedObject: [[NSNumber numberWithInt: num] retain]];
[item setRepresentedObject: [NSNumber numberWithInt: num]];
}
void init_menubar() {
@@ -63,7 +63,7 @@ void init_menubar() {
eMenu::NONE, eMenu::LEAVE_SCENARIO, eMenu::SET_SDF,
};
MenuHandler* handler = [[[MenuHandler alloc] init] retain];
MenuHandler* handler = [[MenuHandler alloc] init];
setMenuCallback([apple_menu itemWithTitle: @"About BoE Character Editor"], handler, @selector(menuChoice:), int(eMenu::ABOUT));
setMenuCallback([apple_menu itemWithTitle: @"Preferences…"], handler, @selector(menuChoice:), int(eMenu::PREFS));
setMenuCallback([apple_menu itemWithTitle: @"Quit BoE Character Editor"], handler, @selector(menuChoice:), int(eMenu::QUIT));

4
src/scenedit/scen.menus.mac.mm
View File

@@ -28,7 +28,7 @@ extern cUndoList undo_list;
static void setMenuCallback(NSMenuItem* item, id targ, SEL selector, int num) {
[item setTarget: targ];
[item setAction: selector];
[item setRepresentedObject: [[NSNumber numberWithInt: num] retain]];
[item setRepresentedObject: [NSNumber numberWithInt: num]];
}
void init_menubar() {
@@ -77,7 +77,7 @@ void init_menubar() {
eMenu::HELP_TOC, eMenu::NONE, eMenu::HELP_START, eMenu::HELP_TEST, eMenu::HELP_DIST, eMenu::NONE, eMenu::HELP_CONTEST,
};
MenuHandler* handler = [[[MenuHandler alloc] init] retain];
MenuHandler* handler = [[MenuHandler alloc] init];
setMenuCallback([app_menu itemWithTitle: @"About BoE Scenario Editor"], handler, @selector(menuChoice:), int(eMenu::ABOUT));
setMenuCallback([app_menu itemWithTitle: @"Preferences…"], handler, @selector(menuChoice:), int(eMenu::PREFS));
setMenuCallback([app_menu itemWithTitle: @"Quit BoE Scenario Editor"], handler, @selector(menuChoice:), int(eMenu::QUIT));