summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2019-08-02 12:08:15 -0400
committer AJR <ajrhacker@users.noreply.github.com>2019-08-02 12:12:04 -0400
commit8013c43adf62485a9f9d95a45c525c97191c9398 (patch)
tree490dde363aeebcc50ad703a1136664152023065c /src/emu
parent478ec7352fec88d0506cc645a832677c6bc153d2 (diff)
Use canonical spelling of "canonical" (nw)
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/diimage.h2
-rw-r--r--src/emu/emuopts.cpp36
-rw-r--r--src/emu/emuopts.h2
3 files changed, 20 insertions, 20 deletions
diff --git a/src/emu/diimage.h b/src/emu/diimage.h
index 0ebdd9e5ea6..51a032d35e6 100644
--- a/src/emu/diimage.h
+++ b/src/emu/diimage.h
@@ -203,7 +203,7 @@ public:
const std::string &instance_name() const { return m_instance_name; }
const std::string &brief_instance_name() const { return m_brief_instance_name; }
- const std::string &cannonical_instance_name() const { return m_canonical_instance_name; }
+ const std::string &canonical_instance_name() const { return m_canonical_instance_name; }
bool uses_file_extension(const char *file_extension) const;
const formatlist_type &formatlist() const { return m_formatlist; }
diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp
index e2beaf0089d..1d52bc958d5 100644
--- a/src/emu/emuopts.cpp
+++ b/src/emu/emuopts.cpp
@@ -385,9 +385,9 @@ namespace
if (!same_name)
result.push_back(image.brief_instance_name());
- if (image.instance_name() != image.cannonical_instance_name())
+ if (image.instance_name() != image.canonical_instance_name())
{
- result.push_back(image.cannonical_instance_name());
+ result.push_back(image.canonical_instance_name());
if (!same_name)
result.push_back(image.brief_instance_name() + "1");
}
@@ -565,7 +565,7 @@ bool emu_options::add_and_remove_slot_options()
for (const device_slot_interface &slot : slot_interface_iterator(config.root_device()))
{
- // come up with the cannonical name of the slot
+ // come up with the canonical name of the slot
const char *slot_option_name = slot.slot_name();
// erase this option from existing (so we don't purge it later)
@@ -631,7 +631,7 @@ bool emu_options::add_and_remove_image_options()
// "cartridge" starting out, but become "cartridge1" when another cartridge device is added.
//
// To get around this behavior, our internal data structures work in terms of what is
- // returned by cannonical_instance_name(), which will be something like "cartridge1" both
+ // returned by canonical_instance_name(), which will be something like "cartridge1" both
// for a singular cartridge device and the first cartridge in a multi cartridge system.
//
// The need for this behavior was identified by Tafoid when the following command line
@@ -647,9 +647,9 @@ bool emu_options::add_and_remove_image_options()
// first, create a list of existing image options; this is so we can purge
// any stray slot options that are no longer pertinent when we're done; we
// have to do this for both "flavors" of name
- existing_option_tracker<::image_option> existing(m_image_options_cannonical);
+ existing_option_tracker<::image_option> existing(m_image_options_canonical);
- // wipe the non-cannonical image options; we're going to rebuild it
+ // wipe the non-canonical image options; we're going to rebuild it
m_image_options.clear();
// it is perfectly legal for this to be called without a system; we
@@ -662,19 +662,19 @@ bool emu_options::add_and_remove_image_options()
// iterate through all image devices
for (device_image_interface &image : image_interface_iterator(config.root_device()))
{
- const std::string &cannonical_name(image.cannonical_instance_name());
+ const std::string &canonical_name(image.canonical_instance_name());
// erase this option from existing (so we don't purge it later)
- existing.remove(cannonical_name);
+ existing.remove(canonical_name);
// do we need to add this option?
- auto iter = m_image_options_cannonical.find(cannonical_name);
- ::image_option *this_option = iter != m_image_options_cannonical.end() ? &iter->second : nullptr;
+ auto iter = m_image_options_canonical.find(canonical_name);
+ ::image_option *this_option = iter != m_image_options_canonical.end() ? &iter->second : nullptr;
if (!this_option)
{
- // we do - add it to both m_image_options_cannonical and m_image_options
- auto pair = std::make_pair(cannonical_name, ::image_option(*this, image.cannonical_instance_name()));
- this_option = &m_image_options_cannonical.emplace(std::move(pair)).first->second;
+ // we do - add it to both m_image_options_canonical and m_image_options
+ auto pair = std::make_pair(canonical_name, ::image_option(*this, image.canonical_instance_name()));
+ this_option = &m_image_options_canonical.emplace(std::move(pair)).first->second;
changed = true;
// if this image is user loadable, we have to surface it in the core_options
@@ -704,15 +704,15 @@ bool emu_options::add_and_remove_image_options()
// at this point we need to purge stray image options that may no longer be pertinent
for (auto &opt_name : existing)
{
- auto iter = m_image_options_cannonical.find(*opt_name);
- assert(iter != m_image_options_cannonical.end());
+ auto iter = m_image_options_canonical.find(*opt_name);
+ assert(iter != m_image_options_canonical.end());
// if this is represented in core_options, remove it
if (iter->second.option_entry())
remove_entry(*iter->second.option_entry());
// remove this option
- m_image_options_cannonical.erase(iter);
+ m_image_options_canonical.erase(iter);
changed = true;
}
@@ -1233,9 +1233,9 @@ core_options::entry::shared_ptr slot_option::setup_option_entry(const char *name
// image_option ctor
//-------------------------------------------------
-image_option::image_option(emu_options &host, const std::string &cannonical_instance_name)
+image_option::image_option(emu_options &host, const std::string &canonical_instance_name)
: m_host(host)
- , m_canonical_instance_name(cannonical_instance_name)
+ , m_canonical_instance_name(canonical_instance_name)
{
}
diff --git a/src/emu/emuopts.h b/src/emu/emuopts.h
index 0e66f8f84d7..1036d3c3e06 100644
--- a/src/emu/emuopts.h
+++ b/src/emu/emuopts.h
@@ -511,7 +511,7 @@ private:
// slots and devices
std::unordered_map<std::string, ::slot_option> m_slot_options;
- std::unordered_map<std::string, ::image_option> m_image_options_cannonical;
+ std::unordered_map<std::string, ::image_option> m_image_options_canonical;
std::unordered_map<std::string, ::image_option *> m_image_options;
// cached options, for scenarios where parsing core_options is too slow