diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2022-08-27 10:47:05 -0400 |
---|---|---|
committer | AJR <ajrhacker@users.noreply.github.com> | 2022-08-27 10:47:05 -0400 |
commit | f3f4a7a5d4d6a85beedca953bb89db3c89924b6f (patch) | |
tree | 9e31718c386960f58343d3a9fc129b3a05b8b4ad /src/emu | |
parent | c26f3dd96bb436d531719222e25778925fae7583 (diff) |
Use util::streqlower in more places
Diffstat (limited to 'src/emu')
-rw-r--r-- | src/emu/diimage.cpp | 4 | ||||
-rw-r--r-- | src/emu/dislot.cpp | 7 | ||||
-rw-r--r-- | src/emu/softlist_dev.cpp | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/emu/diimage.cpp b/src/emu/diimage.cpp index 4e5ca05e002..f60fa032dd8 100644 --- a/src/emu/diimage.cpp +++ b/src/emu/diimage.cpp @@ -23,7 +23,6 @@ #include "zippath.h" #include <algorithm> -#include <cctype> #include <cstring> #include <regex> #include <sstream> @@ -140,8 +139,7 @@ void device_image_interface::set_image_filename(std::string_view filename) bool device_image_interface::is_filetype(std::string_view candidate_filetype) const { - return std::equal(m_filetype.begin(), m_filetype.end(), candidate_filetype.begin(), candidate_filetype.end(), - [] (unsigned char c1, unsigned char c2) { return std::tolower(c1) == c2; }); + return util::streqlower(m_filetype, candidate_filetype); } diff --git a/src/emu/dislot.cpp b/src/emu/dislot.cpp index 6f7bb4b592f..868b0ebf103 100644 --- a/src/emu/dislot.cpp +++ b/src/emu/dislot.cpp @@ -8,9 +8,9 @@ #include "emu.h" #include "emuopts.h" + +#include "corestr.h" #include "zippath.h" -#include <algorithm> -#include <cctype> device_slot_interface::device_slot_interface(const machine_config &mconfig, device_t &device) : @@ -170,6 +170,5 @@ bool get_default_card_software_hook::hashfile_extrainfo(std::string &extrainfo) bool get_default_card_software_hook::is_filetype(std::string_view candidate_filetype) const { - return std::equal(m_file_type.begin(), m_file_type.end(), candidate_filetype.begin(), candidate_filetype.end(), - [] (unsigned char c1, unsigned char c2) { return std::tolower(c1) == c2; }); + return util::streqlower(m_file_type, candidate_filetype); } diff --git a/src/emu/softlist_dev.cpp b/src/emu/softlist_dev.cpp index c6a32f0b30f..07ece5ec42f 100644 --- a/src/emu/softlist_dev.cpp +++ b/src/emu/softlist_dev.cpp @@ -267,7 +267,7 @@ const software_info *software_list_device::find(const std::string &look_for) { const char *shortname = info.shortname().c_str(); return (iswild && core_strwildcmp(look_for.c_str(), shortname) == 0) - || core_stricmp(look_for.c_str(), shortname) == 0; + || util::streqlower(look_for, shortname); }); return iter != info_list.end() ? &*iter : nullptr; |