diff options
| author | 2016-04-25 20:09:51 -0400 | |
|---|---|---|
| committer | 2016-04-25 20:09:51 -0400 | |
| commit | 596678f2cd1b40c456db8f278a7f652c2a37da84 (patch) | |
| tree | a4ffbdf51889f7a63ea7dc3da3afee4535987030 /src/osd/modules/debugger/debugwin.cpp | |
| parent | ec2669cacff2ec954ba351e09ba083c4e32b4ce4 (diff) | |
| parent | e8326cdc3267591b635f4f97e5255e031ba6b834 (diff) | |
Merge remote-tracking branch 'upstream/master' into firstrun
Diffstat (limited to 'src/osd/modules/debugger/debugwin.cpp')
| -rw-r--r-- | src/osd/modules/debugger/debugwin.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/osd/modules/debugger/debugwin.cpp b/src/osd/modules/debugger/debugwin.cpp index a32405c4aa8..1f68e6989eb 100644 --- a/src/osd/modules/debugger/debugwin.cpp +++ b/src/osd/modules/debugger/debugwin.cpp @@ -35,11 +35,11 @@ public: debugger_windows() : osd_module(OSD_DEBUG_PROVIDER, "windows"), debug_module(), - m_machine(NULL), + m_machine(nullptr), m_metrics(), m_waiting_for_debugger(false), m_window_list(), - m_main_console(NULL) + m_main_console(nullptr) { } @@ -83,12 +83,12 @@ private: void debugger_windows::exit() { // loop over windows and free them - while (m_window_list.first() != NULL) + while (m_window_list.first() != nullptr) m_window_list.first()->destroy(); - m_main_console = NULL; + m_main_console = nullptr; m_metrics.reset(); - m_machine = NULL; + m_machine = nullptr; } @@ -102,15 +102,15 @@ void debugger_windows::init_debugger(running_machine &machine) void debugger_windows::wait_for_debugger(device_t &device, bool firststop) { // create a console window - if (m_main_console == NULL) + if (m_main_console == nullptr) m_main_console = create_window<consolewin_info>(); // update the views in the console to reflect the current CPU - if (m_main_console != NULL) + if (m_main_console != nullptr) m_main_console->set_cpu(device); // when we are first stopped, adjust focus to us - if (firststop && (m_main_console != NULL)) + if (firststop && (m_main_console != nullptr)) { m_main_console->set_foreground(); if (winwindow_has_focus()) @@ -126,7 +126,7 @@ void debugger_windows::wait_for_debugger(device_t &device, bool firststop) // get and process messages MSG message; - GetMessage(&message, NULL, 0, 0); + GetMessage(&message, nullptr, 0, 0); switch (message.message) { @@ -254,7 +254,7 @@ template <typename T> T *debugger_windows::create_window() else { global_free(info); - return NULL; + return nullptr; } } |
