summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/diimage.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-04-01 19:10:26 +1000
committer Vas Crabb <vas@vastheman.com>2018-04-01 19:10:26 +1000
commit2c340f490e67efd1ba37312e40b30289c025488b (patch)
tree791cd5adb237d2fb3276d17be80e54fadbd308c9 /src/emu/diimage.cpp
parent397f54e29a8946041e7f09411f629094b6dff3e5 (diff)
move some not-directly-emulation-related helpers to lib/util, further extricate emu.h from tools (nw)
Diffstat (limited to 'src/emu/diimage.cpp')
-rw-r--r--src/emu/diimage.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/emu/diimage.cpp b/src/emu/diimage.cpp
index bd814953685..1a30cb1d1ad 100644
--- a/src/emu/diimage.cpp
+++ b/src/emu/diimage.cpp
@@ -85,19 +85,19 @@ image_device_format::~image_device_format()
//-------------------------------------------------
device_image_interface::device_image_interface(const machine_config &mconfig, device_t &device)
- : device_interface(device, "image"),
- m_err(),
- m_file(),
- m_mame_file(),
- m_software_part_ptr(nullptr),
- m_supported(0),
- m_readonly(false),
- m_created(false),
- m_create_format(0),
- m_create_args(nullptr),
- m_user_loadable(true),
- m_is_loading(false),
- m_is_reset_and_loading(false)
+ : device_interface(device, "image")
+ , m_err()
+ , m_file()
+ , m_mame_file()
+ , m_software_part_ptr(nullptr)
+ , m_supported(0)
+ , m_readonly(false)
+ , m_created(false)
+ , m_create_format(0)
+ , m_create_args(nullptr)
+ , m_user_loadable(true)
+ , m_is_loading(false)
+ , m_is_reset_and_loading(false)
{
}
@@ -430,7 +430,7 @@ const std::string &device_image_interface::working_directory()
const software_info *device_image_interface::software_entry() const
{
- return (m_software_part_ptr == nullptr) ? nullptr : &m_software_part_ptr->info();
+ return !m_software_part_ptr ? nullptr : &m_software_part_ptr->info();
}
@@ -465,9 +465,9 @@ u32 device_image_interface::get_software_region_length(const char *tag)
// image_get_feature
//-------------------------------------------------
-const char *device_image_interface::get_feature(const char *feature_name)
+const char *device_image_interface::get_feature(const char *feature_name) const
{
- return (m_software_part_ptr == nullptr) ? nullptr : m_software_part_ptr->feature(feature_name);
+ return !m_software_part_ptr ? nullptr : m_software_part_ptr->feature(feature_name);
}