summaryrefslogtreecommitdiffstats
path: root/docs/release/src/frontend/mame/clifront.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'docs/release/src/frontend/mame/clifront.cpp')
-rw-r--r--docs/release/src/frontend/mame/clifront.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/docs/release/src/frontend/mame/clifront.cpp b/docs/release/src/frontend/mame/clifront.cpp
index 0a667dc4856..70fed3219e2 100644
--- a/docs/release/src/frontend/mame/clifront.cpp
+++ b/docs/release/src/frontend/mame/clifront.cpp
@@ -222,10 +222,10 @@ void cli_frontend::start_execution(mame_machine_manager *manager, const std::vec
{
// if we failed, check for no command and a system name first; in that case error on the name
if (m_options.command().empty() && mame_options::system(m_options) == nullptr && !m_options.attempted_system_name().empty())
- throw emu_fatalerror(EMU_ERR_NO_SUCH_SYSTEM, "Unknown system '%s'", m_options.attempted_system_name().c_str());
+ throw emu_fatalerror(EMU_ERR_NO_SUCH_SYSTEM, "Unknown system '%s'", m_options.attempted_system_name());
// otherwise, error on the options
- throw emu_fatalerror(EMU_ERR_INVALID_CONFIG, "%s", ex.message().c_str());
+ throw emu_fatalerror(EMU_ERR_INVALID_CONFIG, "%s", ex.message());
}
// determine the base name of the EXE
@@ -310,7 +310,7 @@ int cli_frontend::execute(std::vector<std::string> &args)
// print them out
osd_printf_error("\n\"%s\" approximately matches the following\n"
- "supported machines (best match first):\n\n", m_options.attempted_system_name().c_str());
+ "supported machines (best match first):\n\n", m_options.attempted_system_name());
for (int match : matches)
{
if (0 <= match)
@@ -514,7 +514,7 @@ void cli_frontend::listcrc(const std::vector<std::string> &args)
args,
[] (device_t &root, char const *type, bool first)
{
- for (device_t const &device : device_iterator(root))
+ for (device_t const &device : device_enumerator(root))
{
for (tiny_rom_entry const *rom = device.rom_region(); rom && !ROMENTRY_ISEND(rom); ++rom)
{
@@ -548,7 +548,7 @@ void cli_frontend::listroms(const std::vector<std::string> &args)
// iterate through ROMs
bool hasroms = false;
- for (device_t const &device : device_iterator(root))
+ for (device_t const &device : device_enumerator(root))
{
for (const rom_entry *region = rom_first_region(device); region; region = rom_next_region(region))
{
@@ -618,7 +618,7 @@ void cli_frontend::listsamples(const std::vector<std::string> &args)
while (drivlist.next())
{
// see if we have samples
- samples_device_iterator iter(drivlist.config()->root_device());
+ samples_device_enumerator iter(drivlist.config()->root_device());
if (iter.count() == 0)
continue;
@@ -665,7 +665,7 @@ void cli_frontend::listdevices(const std::vector<std::string> &args)
// build a list of devices
std::vector<device_t *> device_list;
- for (device_t &device : device_iterator(drivlist.config()->root_device()))
+ for (device_t &device : device_enumerator(drivlist.config()->root_device()))
device_list.push_back(&device);
// sort them by tag
@@ -747,7 +747,7 @@ void cli_frontend::listslots(const std::vector<std::string> &args)
{
// iterate
bool first = true;
- for (const device_slot_interface &slot : slot_interface_iterator(drivlist.config()->root_device()))
+ for (const device_slot_interface &slot : slot_interface_enumerator(drivlist.config()->root_device()))
{
if (slot.fixed()) continue;
@@ -815,7 +815,7 @@ void cli_frontend::listmedia(const std::vector<std::string> &args)
{
// iterate
bool first = true;
- for (const device_image_interface &imagedev : image_interface_iterator(drivlist.config()->root_device()))
+ for (const device_image_interface &imagedev : image_interface_enumerator(drivlist.config()->root_device()))
{
if (!imagedev.user_loadable())
continue;
@@ -941,7 +941,7 @@ void cli_frontend::verifyroms(const std::vector<std::string> &args)
for (std::string const &pat : args)
{
if (!*it)
- throw emu_fatalerror(EMU_ERR_NO_SUCH_SYSTEM, "No matching systems found for '%s'", pat.c_str());
+ throw emu_fatalerror(EMU_ERR_NO_SUCH_SYSTEM, "No matching systems found for '%s'", pat);
++it;
}
@@ -950,9 +950,9 @@ void cli_frontend::verifyroms(const std::vector<std::string> &args)
{
// if we didn't get anything at all, display a generic end message
if (notfound > 0)
- throw emu_fatalerror(EMU_ERR_MISSING_FILES, "romset \"%s\" not found!\n", args[0].c_str());
+ throw emu_fatalerror(EMU_ERR_MISSING_FILES, "romset \"%s\" not found!\n", args[0]);
else
- throw emu_fatalerror(EMU_ERR_MISSING_FILES, "romset \"%s\" has no roms!\n", args[0].c_str());
+ throw emu_fatalerror(EMU_ERR_MISSING_FILES, "romset \"%s\" has no roms!\n", args[0]);
}
else
{
@@ -1215,7 +1215,7 @@ void cli_frontend::listsoftware(const std::vector<std::string> &args)
args,
[this, &list_map, &firstlist] (device_t &root, char const *type, bool first)
{
- for (software_list_device &swlistdev : software_list_device_iterator(root))
+ for (software_list_device &swlistdev : software_list_device_enumerator(root))
{
if (list_map.insert(swlistdev.list_name()).second)
{
@@ -1268,7 +1268,7 @@ void cli_frontend::verifysoftware(const std::vector<std::string> &args)
{
matched++;
- for (software_list_device &swlistdev : software_list_device_iterator(drivlist.config()->root_device()))
+ for (software_list_device &swlistdev : software_list_device_enumerator(drivlist.config()->root_device()))
{
if (swlistdev.is_original())
{
@@ -1330,7 +1330,7 @@ void cli_frontend::getsoftlist(const std::vector<std::string> &args)
std::vector<std::string>(),
[this, gamename, &list_map, &firstlist] (device_t &root, char const *type, bool first)
{
- for (software_list_device &swlistdev : software_list_device_iterator(root))
+ for (software_list_device &swlistdev : software_list_device_enumerator(root))
{
if (core_strwildcmp(gamename, swlistdev.list_name().c_str()) == 0 && list_map.insert(swlistdev.list_name()).second)
{
@@ -1375,7 +1375,7 @@ void cli_frontend::verifysoftlist(const std::vector<std::string> &args)
while (drivlist.next())
{
- for (software_list_device &swlistdev : software_list_device_iterator(drivlist.config()->root_device()))
+ for (software_list_device &swlistdev : software_list_device_enumerator(drivlist.config()->root_device()))
{
if (core_strwildcmp(gamename, swlistdev.list_name().c_str()) == 0 && list_map.insert(swlistdev.list_name()).second)
{
@@ -1533,7 +1533,7 @@ template <typename T, typename U> void cli_frontend::apply_action(const std::vec
for (std::string const &pat : args)
{
if (!*it)
- throw emu_fatalerror(EMU_ERR_NO_SUCH_SYSTEM, "No matching systems found for '%s'", pat.c_str());
+ throw emu_fatalerror(EMU_ERR_NO_SUCH_SYSTEM, "No matching systems found for '%s'", pat);
++it;
}
@@ -1717,7 +1717,7 @@ void cli_frontend::execute_commands(const char *exename)
if (!m_osd.execute_command(m_options.command().c_str()))
// if we get here, we don't know what has been requested
- throw emu_fatalerror(EMU_ERR_INVALID_CONFIG, "Unknown command '%s' specified", m_options.command().c_str());
+ throw emu_fatalerror(EMU_ERR_INVALID_CONFIG, "Unknown command '%s' specified", m_options.command());
}