summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/dislot.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/dislot.cpp')
-rw-r--r--src/emu/dislot.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/emu/dislot.cpp b/src/emu/dislot.cpp
index 7a6d2471d6e..697eb673a9f 100644
--- a/src/emu/dislot.cpp
+++ b/src/emu/dislot.cpp
@@ -11,7 +11,7 @@
device_slot_interface::device_slot_interface(const machine_config &mconfig, device_t &device)
: device_interface(device, "slot"),
- m_default_option(NULL),
+ m_default_option(nullptr),
m_fixed(false)
{
}
@@ -20,14 +20,14 @@ device_slot_interface::~device_slot_interface()
{
}
-device_slot_option::device_slot_option(const char *name, const device_type &devtype):
- m_next(NULL),
- m_name(name),
+device_slot_option::device_slot_option(const char *name, const device_type &devtype):
+ m_next(nullptr),
+ m_name(name),
m_devtype(devtype),
m_selectable(true),
- m_default_bios(NULL),
- m_machine_config(NULL),
- m_input_device_defaults(NULL),
+ m_default_bios(nullptr),
+ m_machine_config(nullptr),
+ m_input_device_defaults(nullptr),
m_clock(0)
{
}
@@ -44,7 +44,7 @@ void device_slot_interface::static_option_add(device_t &device, const char *name
device_slot_interface &intf = dynamic_cast<device_slot_interface &>(device);
device_slot_option *option = intf.option(name);
- if (option != NULL)
+ if (option != nullptr)
throw emu_fatalerror("slot '%s' duplicate option '%s\n", device.tag(), name);
intf.m_options.append(name, *global_alloc(device_slot_option(name, devtype)));
@@ -55,7 +55,7 @@ device_slot_option *device_slot_interface::static_option(device_t &device, const
device_slot_interface &intf = dynamic_cast<device_slot_interface &>(device);
device_slot_option *option = intf.option(name);
- if (option == NULL)
+ if (option == nullptr)
throw emu_fatalerror("slot '%s' has no option '%s\n", device.tag(), name);
return option;
@@ -64,7 +64,7 @@ device_slot_option *device_slot_interface::static_option(device_t &device, const
device_t* device_slot_interface::get_card_device()
{
const char *subtag;
- device_t *dev = NULL;
+ device_t *dev = nullptr;
std::string temp;
if (!device().mconfig().options().exists(device().tag()+1)) {
subtag = m_default_option;
@@ -72,9 +72,9 @@ device_t* device_slot_interface::get_card_device()
subtag = device().mconfig().options().main_value(temp,device().tag()+1);
}
if (subtag && *subtag != 0) {
- device_slot_card_interface *intf = NULL;
+ device_slot_card_interface *intf = nullptr;
dev = device().subdevice(subtag);
- if (dev!=NULL && !dev->interface(intf))
+ if (dev!=nullptr && !dev->interface(intf))
throw emu_fatalerror("get_card_device called for device '%s' with no slot card interface", dev->tag());
}
return dev;