summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/ui/slotopt.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/ui/slotopt.cpp')
-rw-r--r--src/emu/ui/slotopt.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/emu/ui/slotopt.cpp b/src/emu/ui/slotopt.cpp
index 510e3392ec8..370fe8388a7 100644
--- a/src/emu/ui/slotopt.cpp
+++ b/src/emu/ui/slotopt.cpp
@@ -42,10 +42,10 @@ int ui_menu_slot_devices::slot_get_current_index(device_slot_interface *slot)
{
const device_slot_option *current = slot_get_current_option(slot);
- if (current != NULL)
+ if (current != nullptr)
{
int val = 0;
- for (const device_slot_option *option = slot->first_option(); option != NULL; option = option->next())
+ for (const device_slot_option *option = slot->first_option(); option != nullptr; option = option->next())
{
if (option == current)
return val;
@@ -64,7 +64,7 @@ int ui_menu_slot_devices::slot_get_current_index(device_slot_interface *slot)
int ui_menu_slot_devices::slot_get_length(device_slot_interface *slot)
{
int val = 0;
- for (const device_slot_option *option = slot->first_option(); option != NULL; option = option->next())
+ for (const device_slot_option *option = slot->first_option(); option != nullptr; option = option->next())
if (option->selectable())
val++;
@@ -113,7 +113,7 @@ const char *ui_menu_slot_devices::slot_get_option(device_slot_interface *slot, i
if (index >= 0)
{
int val = 0;
- for (const device_slot_option *option = slot->first_option(); option != NULL; option = option->next())
+ for (const device_slot_option *option = slot->first_option(); option != nullptr; option = option->next())
{
if (val == index)
return option->name();
@@ -152,12 +152,12 @@ void ui_menu_slot_devices::populate()
{
/* cycle through all devices for this system */
slot_interface_iterator iter(machine().root_device());
- for (device_slot_interface *slot = iter.first(); slot != NULL; slot = iter.next())
+ for (device_slot_interface *slot = iter.first(); slot != nullptr; slot = iter.next())
{
/* record the menu item */
const device_slot_option *option = slot_get_current_option(slot);
std::string opt_name;
- if (option == NULL)
+ if (option == nullptr)
opt_name.assign("------");
else
{
@@ -168,8 +168,8 @@ void ui_menu_slot_devices::populate()
item_append(slot->device().tag() + 1, opt_name.c_str(), (slot->fixed() || slot_get_length(slot) == 0) ? 0 : (MENU_FLAG_LEFT_ARROW | MENU_FLAG_RIGHT_ARROW), (void *)slot);
}
- item_append(MENU_SEPARATOR_ITEM, NULL, 0, NULL);
- item_append("Reset", NULL, 0, (void *)1);
+ item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
+ item_append("Reset", nullptr, 0, (void *)1);
}
ui_menu_slot_devices::~ui_menu_slot_devices()
@@ -185,7 +185,7 @@ void ui_menu_slot_devices::handle()
/* process the menu */
const ui_menu_event *menu_event = process(0);
- if (menu_event != NULL && menu_event->itemref != NULL)
+ if (menu_event != nullptr && menu_event->itemref != nullptr)
{
if ((FPTR)menu_event->itemref == 1 && menu_event->iptkey == IPT_UI_SELECT)
{