diff options
Diffstat (limited to 'src/emu/info.cpp')
-rw-r--r-- | src/emu/info.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/emu/info.cpp b/src/emu/info.cpp index 4bae0daf37a..28590bd2857 100644 --- a/src/emu/info.cpp +++ b/src/emu/info.cpp @@ -397,7 +397,7 @@ void info_xml_creator::output_devices() if (device->owner() != nullptr && device->shortname()!= nullptr && device->shortname()[0]!='\0') { if (shortnames.insert(device->shortname()).second) - output_one_device(*device, device->tag()); + output_one_device(*device, device->tag().c_str()); } } @@ -427,7 +427,7 @@ void info_xml_creator::output_devices() if (device->owner() == dev && device->shortname()!= nullptr && device->shortname()[0]!='\0') { if (shortnames.insert(device->shortname()).second) - output_one_device(*device, device->tag()); + output_one_device(*device, device->tag().c_str()); } } @@ -640,7 +640,7 @@ void info_xml_creator::output_chips(device_t &device, const char *root_tag) execute_interface_iterator execiter(device); for (device_execute_interface *exec = execiter.first(); exec != nullptr; exec = execiter.next()) { - if (strcmp(exec->device().tag(), device.tag())) + if (exec->device().tag() != device.tag()) { std::string newtag(exec->device().tag()), oldtag(":"); newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length()); @@ -658,7 +658,7 @@ void info_xml_creator::output_chips(device_t &device, const char *root_tag) sound_interface_iterator sounditer(device); for (device_sound_interface *sound = sounditer.first(); sound != nullptr; sound = sounditer.next()) { - if (strcmp(sound->device().tag(), device.tag())) + if (sound->device().tag() != device.tag()) { std::string newtag(sound->device().tag()), oldtag(":"); newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length()); @@ -686,7 +686,7 @@ void info_xml_creator::output_display(device_t &device, const char *root_tag) screen_device_iterator iter(device); for (const screen_device *screendev = iter.first(); screendev != nullptr; screendev = iter.next()) { - if (strcmp(screendev->tag(), device.tag())) + if (screendev->tag() != device.tag()) { std::string newtag(screendev->tag()), oldtag(":"); newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length()); @@ -1124,7 +1124,7 @@ void info_xml_creator::output_ports(const ioport_list &portlist) // cycle through ports for (ioport_port *port = portlist.first(); port != nullptr; port = port->next()) { - fprintf(m_output,"\t\t<port tag=\"%s\">\n",port->tag()); + fprintf(m_output,"\t\t<port tag=\"%s\">\n",port->tag().c_str()); for (ioport_field *field = port->first_field(); field != nullptr; field = field->next()) { if(field->is_analog()) @@ -1223,7 +1223,7 @@ void info_xml_creator::output_images(device_t &device, const char *root_tag) image_interface_iterator iter(device); for (const device_image_interface *imagedev = iter.first(); imagedev != nullptr; imagedev = iter.next()) { - if (strcmp(imagedev->device().tag(), device.tag())) + if (imagedev->device().tag() != device.tag()) { std::string newtag(imagedev->device().tag()), oldtag(":"); newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length()); @@ -1232,7 +1232,7 @@ void info_xml_creator::output_images(device_t &device, const char *root_tag) fprintf(m_output, "\t\t<device type=\"%s\"", xml_normalize_string(imagedev->image_type_name())); // does this device have a tag? - if (imagedev->device().tag()) + if (!imagedev->device().tag().empty()) fprintf(m_output, " tag=\"%s\"", xml_normalize_string(newtag.c_str())); // is this device mandatory? @@ -1281,7 +1281,7 @@ void info_xml_creator::output_slots(device_t &device, const char *root_tag) { if (slot->fixed()) continue; // or shall we list these as non-configurable? - if (strcmp(slot->device().tag(), device.tag())) + if (slot->device().tag()!=device.tag()) { std::string newtag(slot->device().tag()), oldtag(":"); newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length()); |