diff options
Diffstat (limited to 'src/emu/divideo.cpp')
-rw-r--r-- | src/emu/divideo.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/emu/divideo.cpp b/src/emu/divideo.cpp index 82433d93e88..2ba4d117a28 100644 --- a/src/emu/divideo.cpp +++ b/src/emu/divideo.cpp @@ -27,7 +27,7 @@ device_video_interface::device_video_interface(const machine_config &mconfig, de : device_interface(device, "video"), m_screen_required(screen_required), m_screen_tag(s_unconfigured_screen_tag), - m_screen(NULL) + m_screen(nullptr) { } @@ -65,14 +65,14 @@ void device_video_interface::static_set_screen(device_t &device, const char *tag void device_video_interface::interface_validity_check(validity_checker &valid) const { // only look up screens if we haven't explicitly requested no screen - screen_device *screen = NULL; - if (m_screen_tag != NULL) + screen_device *screen = nullptr; + if (m_screen_tag != nullptr) { // find the screen device if explicitly configured if (strcmp(m_screen_tag, s_unconfigured_screen_tag) != 0) { screen = device().siblingdevice<screen_device>(m_screen_tag); - if (screen == NULL) + if (screen == nullptr) osd_printf_error("Screen '%s' not found, explicitly set for device '%s'\n", m_screen_tag, device().tag()); } @@ -81,13 +81,13 @@ void device_video_interface::interface_validity_check(validity_checker &valid) c { screen_device_iterator iter(device().mconfig().root_device()); screen = iter.first(); - if (iter.next() != NULL) + if (iter.next() != nullptr) osd_printf_error("No screen specified for device '%s', but multiple screens found\n", device().tag()); } } // error if no screen is found - if (screen == NULL && m_screen_required) + if (screen == nullptr && m_screen_required) osd_printf_error("Device '%s' requires a screen\n", device().tag()); } @@ -100,13 +100,13 @@ void device_video_interface::interface_validity_check(validity_checker &valid) c void device_video_interface::interface_pre_start() { // only look up screens if we haven't explicitly requested no screen - if (m_screen_tag != NULL) + if (m_screen_tag != nullptr) { // find the screen device if explicitly configured if (strcmp(m_screen_tag, s_unconfigured_screen_tag) != 0) { m_screen = device().siblingdevice<screen_device>(m_screen_tag); - if (m_screen == NULL) + if (m_screen == nullptr) throw emu_fatalerror("Screen '%s' not found, explicitly set for device '%s'", m_screen_tag, device().tag()); } @@ -115,16 +115,16 @@ void device_video_interface::interface_pre_start() { screen_device_iterator iter(device().machine().root_device()); m_screen = iter.first(); - if (iter.next() != NULL) + if (iter.next() != nullptr) throw emu_fatalerror("No screen specified for device '%s', but multiple screens found", device().tag()); } } // fatal error if no screen is found - if (m_screen == NULL && m_screen_required) + if (m_screen == nullptr && m_screen_required) throw emu_fatalerror("Device '%s' requires a screen", device().tag()); // if we have a screen and it's not started, wait for it - if (m_screen != NULL && !m_screen->started()) + if (m_screen != nullptr && !m_screen->started()) throw device_missing_dependencies(); } |