Mercurial > octave
diff libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp @ 28223:45763d59cb4f stable
use nullptr instead of NULL or 0 in a few more places
* QWinTerminalImpl.cpp, oct-procbuf.cc, audioread.cc, jit-typeinfo.cc,
lo-sysdep.cc, url-transfer.cc, shared-fcns.h: Replace NULL and 0 with
nullptr where appropriate.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 15 Apr 2020 15:55:32 -0400 |
| parents | 74bc925ae235 |
| children | 27dc4dae6826 |
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Tue Apr 14 22:53:19 2020 -0400 +++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Wed Apr 15 15:55:32 2020 -0400 @@ -282,9 +282,9 @@ : q (parent), m_command (cmd), m_auto_scroll (true), m_cursorBlinking (false), m_hasBlinkingCursor (true), m_cursorType (BlockCursor), m_beginSelection (0, 0), m_endSelection (0, 0), m_settingSelection (false), - m_process (NULL), m_inWheelEvent (false) + m_process (nullptr), m_inWheelEvent (false) { - log (NULL); + log (nullptr); // Possibly detach from any existing console log ("Detaching from existing console (if any)...\n"); @@ -299,7 +299,7 @@ // Create new (hidden) console hOrigSta = GetProcessWindowStation (); - hNewSta = CreateWindowStation (NULL, 0, GENERIC_ALL, NULL); + hNewSta = CreateWindowStation (nullptr, 0, GENERIC_ALL, nullptr); log ("Current Windows station: %p.\nNew Windows station: %p.\n", hOrigSta, hNewSta); if (! SetProcessWindowStation (hNewSta)) @@ -328,9 +328,9 @@ log ("POSIX standard streams created.\n"); - setvbuf (stdin, NULL, _IONBF, 0); - setvbuf (stdout, NULL, _IONBF, 0); - setvbuf (stderr, NULL, _IONBF, 0); + setvbuf (stdin, nullptr, _IONBF, 0); + setvbuf (stdout, nullptr, _IONBF, 0); + setvbuf (stderr, nullptr, _IONBF, 0); log ("POSIX standard stream buffers adjusted.\n"); @@ -1339,14 +1339,14 @@ si.cb = sizeof (si); ZeroMemory (&pi, sizeof (pi)); - if (CreateProcessW (NULL, + if (CreateProcessW (nullptr, (LPWSTR)cmd.unicode (), - NULL, - NULL, + nullptr, + nullptr, TRUE, 0, - NULL, - NULL, + nullptr, + nullptr, &si, &pi)) { @@ -1354,7 +1354,7 @@ m_process = pi.hProcess; WaitForSingleObject (m_process, INFINITE); CloseHandle (m_process); - m_process = NULL; + m_process = nullptr; } } }