diff options
author | 2019-11-18 06:05:09 +1100 | |
---|---|---|
committer | 2019-11-18 06:05:21 +1100 | |
commit | e4e047f1adb4ecfac8c23a2c33d2f56e7a770512 (patch) | |
tree | a9b4ee1f6a7572037ad26cfec439581e8f3e100e | |
parent | b662a173bd91edac0419490498bcd2ce1ab0793d (diff) |
mac: fix copy/paste error, get rid of allocWithZone as it's ignored on 64-bit ABI (nw)
-rw-r--r-- | src/osd/modules/debugger/debugosx.mm | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/osx/debugview.mm | 2 | ||||
-rw-r--r-- | src/osd/modules/debugger/osx/debugwindowhandler.mm | 8 | ||||
-rw-r--r-- | src/osd/modules/debugger/osx/memoryview.mm | 2 | ||||
-rw-r--r-- | src/tools/aueffectutil.mm | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/osd/modules/debugger/debugosx.mm b/src/osd/modules/debugger/debugosx.mm index def790ef939..629f3e15707 100644 --- a/src/osd/modules/debugger/debugosx.mm +++ b/src/osd/modules/debugger/debugosx.mm @@ -211,7 +211,7 @@ void debugger_osx::build_menus() { NSMenuItem *item; - NSMenu *const debugMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@"Debug"]; + NSMenu *const debugMenu = [[NSMenu alloc] initWithTitle:@"Debug"]; item = [[NSApp mainMenu] insertItemWithTitle:@"Debug" action:NULL keyEquivalent:@"" atIndex:1]; [item setSubmenu:debugMenu]; [debugMenu release]; @@ -243,7 +243,7 @@ void debugger_osx::build_menus() keyEquivalent:[NSString stringWithFormat:@"%C", (short)NSF3FunctionKey]] setKeyEquivalentModifierMask:NSShiftKeyMask]; - NSMenu *const runMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@"Run"]; + NSMenu *const runMenu = [[NSMenu alloc] initWithTitle:@"Run"]; item = [[NSApp mainMenu] insertItemWithTitle:@"Run" action:NULL keyEquivalent:@"" diff --git a/src/osd/modules/debugger/osx/debugview.mm b/src/osd/modules/debugger/osx/debugview.mm index f3e4c6b8b64..731ea8227b2 100644 --- a/src/osd/modules/debugger/osx/debugview.mm +++ b/src/osd/modules/debugger/osx/debugview.mm @@ -255,7 +255,7 @@ static void debugwin_view_update(debug_view &view, void *osdprivate) [self setFont:[[self class] defaultFontForMachine:m]]; - NSMenu *contextMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@"Context"]; + NSMenu *contextMenu = [[NSMenu alloc] initWithTitle:@"Context"]; [self addContextMenuItemsToMenu:contextMenu]; [self setMenu:contextMenu]; [contextMenu release]; diff --git a/src/osd/modules/debugger/osx/debugwindowhandler.mm b/src/osd/modules/debugger/osx/debugwindowhandler.mm index 27d487c86ff..c1aa8e383a2 100644 --- a/src/osd/modules/debugger/osx/debugwindowhandler.mm +++ b/src/osd/modules/debugger/osx/debugwindowhandler.mm @@ -42,7 +42,7 @@ NSString *const MAMESaveDebuggerConfigurationNotification = @"MAMESaveDebuggerCo NSMenuItem *runParentItem = [menu addItemWithTitle:@"Run" action:@selector(debugRun:) keyEquivalent:[NSString stringWithFormat:@"%C", (short)NSF5FunctionKey]]; - NSMenu *runMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@"Run"]; + NSMenu *runMenu = [[NSMenu alloc] initWithTitle:@"Run"]; [runParentItem setSubmenu:runMenu]; [runMenu release]; [runParentItem setKeyEquivalentModifierMask:0]; @@ -64,7 +64,7 @@ NSString *const MAMESaveDebuggerConfigurationNotification = @"MAMESaveDebuggerCo setKeyEquivalentModifierMask:0]; NSMenuItem *stepParentItem = [menu addItemWithTitle:@"Step" action:NULL keyEquivalent:@""]; - NSMenu *stepMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@"Step"]; + NSMenu *stepMenu = [[NSMenu alloc] initWithTitle:@"Step"]; [stepParentItem setSubmenu:stepMenu]; [stepMenu release]; [[stepMenu addItemWithTitle:@"Into" @@ -81,7 +81,7 @@ NSString *const MAMESaveDebuggerConfigurationNotification = @"MAMESaveDebuggerCo setKeyEquivalentModifierMask:NSShiftKeyMask]; NSMenuItem *resetParentItem = [menu addItemWithTitle:@"Reset" action:NULL keyEquivalent:@""]; - NSMenu *resetMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@"Reset"]; + NSMenu *resetMenu = [[NSMenu alloc] initWithTitle:@"Reset"]; [resetParentItem setSubmenu:resetMenu]; [resetMenu release]; [[resetMenu addItemWithTitle:@"Soft" @@ -96,7 +96,7 @@ NSString *const MAMESaveDebuggerConfigurationNotification = @"MAMESaveDebuggerCo [menu addItem:[NSMenuItem separatorItem]]; NSMenuItem *newParentItem = [menu addItemWithTitle:@"New" action:NULL keyEquivalent:@""]; - NSMenu *newMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@"New"]; + NSMenu *newMenu = [[NSMenu alloc] initWithTitle:@"New"]; [newParentItem setSubmenu:newMenu]; [newMenu release]; [newMenu addItemWithTitle:@"Memory Window" diff --git a/src/osd/modules/debugger/osx/memoryview.mm b/src/osd/modules/debugger/osx/memoryview.mm index 49d3f7b2df6..8dde0e2d497 100644 --- a/src/osd/modules/debugger/osx/memoryview.mm +++ b/src/osd/modules/debugger/osx/memoryview.mm @@ -142,7 +142,7 @@ for (auto &ptr : view->source_list()) { debug_view_memory_source const *const source = downcast<debug_view_memory_source const *>(ptr.get()); - if (&source->space() == space) + if (source->space() == space) { if (view->source() != source) { diff --git a/src/tools/aueffectutil.mm b/src/tools/aueffectutil.mm index ccc090d0fa8..d232c735db3 100644 --- a/src/tools/aueffectutil.mm +++ b/src/tools/aueffectutil.mm @@ -772,7 +772,7 @@ static void UpdateChangeCountCallback( NSMenu *submenu; NSString *const appName = [(NSDictionary *)CFBundleGetInfoDictionary(CFBundleGetMainBundle()) objectForKey:@"CFBundleName"]; - NSMenu *const menu = [[NSMenu allocWithZone:[NSMenu zone]] initWithTitle:@"Application"]; + NSMenu *const menu = [[NSMenu alloc] initWithTitle:@"Application"]; item = [parent addItemWithTitle:@"Application" action:NULL keyEquivalent:@""]; [parent setSubmenu:menu forItem:item]; [menu release]; @@ -784,7 +784,7 @@ static void UpdateChangeCountCallback( [menu addItem:[NSMenuItem separatorItem]]; item = [menu addItemWithTitle:@"Services" action:NULL keyEquivalent:@""]; - submenu = [[NSMenu allocWithZone:[NSMenu zone]] initWithTitle:@"Services"]; + submenu = [[NSMenu alloc] initWithTitle:@"Services"]; [menu setSubmenu:submenu forItem:item]; [submenu release]; [NSApp setServicesMenu:submenu]; |