From 5f313860207c707266a28a7223bd73c469fa5573 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 20 Jan 2016 21:34:20 +0100 Subject: [PATCH] Revert "Fix OSX build (nw)" This reverts commit 8144b878ab0ba1fa2b7b9e5e00c614a9a7e58eb6. --- src/osd/modules/debugger/osx/debugconsole.mm | 2 +- src/osd/modules/debugger/osx/deviceinfoviewer.mm | 4 ++-- src/osd/modules/debugger/osx/devicesviewer.mm | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/osd/modules/debugger/osx/debugconsole.mm b/src/osd/modules/debugger/osx/debugconsole.mm index c151801b4fe..f5023a2b76d 100644 --- a/src/osd/modules/debugger/osx/debugconsole.mm +++ b/src/osd/modules/debugger/osx/debugconsole.mm @@ -204,7 +204,7 @@ [dasmView selectSubviewForDevice:device]; [window setTitle:[NSString stringWithFormat:@"Debug: %s - %s '%s'", device->machine().system().name, - device->name().c_str(), + device->name(), device->tag().c_str()]]; } diff --git a/src/osd/modules/debugger/osx/deviceinfoviewer.mm b/src/osd/modules/debugger/osx/deviceinfoviewer.mm index 222a72028b0..15c166e4d5d 100644 --- a/src/osd/modules/debugger/osx/deviceinfoviewer.mm +++ b/src/osd/modules/debugger/osx/deviceinfoviewer.mm @@ -157,11 +157,11 @@ toView:contentView]; [self addLabel:@"Name:" withWidth:100 - andField:[NSString stringWithUTF8String:device->name().c_str()] + andField:[NSString stringWithUTF8String:device->name()] toView:contentView]; [self addLabel:@"Shortname:" withWidth:100 - andField:[NSString stringWithUTF8String:device->shortname().c_str()] + andField:[NSString stringWithUTF8String:device->shortname()] toView:contentView]; // add interfaces if present diff --git a/src/osd/modules/debugger/osx/devicesviewer.mm b/src/osd/modules/debugger/osx/devicesviewer.mm index 31c53b0f3fc..ddf08602bc6 100644 --- a/src/osd/modules/debugger/osx/devicesviewer.mm +++ b/src/osd/modules/debugger/osx/devicesviewer.mm @@ -75,12 +75,12 @@ - (NSString *)tag { return (device == &machine->root_device()) ? @"" - : [NSString stringWithUTF8String:device->basetag().c_str()]; + : [NSString stringWithUTF8String:device->basetag()]; } - (NSString *)name { - return [NSString stringWithUTF8String:device->name().c_str()]; + return [NSString stringWithUTF8String:device->name()]; }