Revert "Fix OSX build (nw)"

This reverts commit 8144b878ab.
This commit is contained in:
Miodrag Milanovic 2016-01-20 21:34:20 +01:00
parent 9619947629
commit 5f31386020
3 changed files with 5 additions and 5 deletions

View File

@ -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()]];
}

View File

@ -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

View File

@ -75,12 +75,12 @@
- (NSString *)tag {
return (device == &machine->root_device()) ? @"<root>"
: [NSString stringWithUTF8String:device->basetag().c_str()];
: [NSString stringWithUTF8String:device->basetag()];
}
- (NSString *)name {
return [NSString stringWithUTF8String:device->name().c_str()];
return [NSString stringWithUTF8String:device->name()];
}