diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2019-03-19 11:55:02 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2019-03-19 11:55:02 +0200 |
| commit | 8c448f77a00d01e24e4d083d9684c275b3efdd04 (patch) | |
| tree | c75af0ceed6555249c6a2413dc5c0ff0aec928bb /src/sdk/console_win.cpp | |
| parent | 2beb45ea0317d0bed9d6085bd927f5a55dff25d5 (diff) | |
| parent | 407b19ff904244e287d62c7d02ca2a0779fc7b09 (diff) | |
Merge branch '3.1' into master
Change-Id: I2ac4e385ee771892369d98495ceceb09c481c018
Diffstat (limited to 'src/sdk/console_win.cpp')
| -rw-r--r-- | src/sdk/console_win.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sdk/console_win.cpp b/src/sdk/console_win.cpp index baca7edaa..f3226bc60 100644 --- a/src/sdk/console_win.cpp +++ b/src/sdk/console_win.cpp @@ -46,7 +46,7 @@ static bool isRedirected(HANDLE stdHandle) { - if (stdHandle == NULL) // launched from GUI + if (stdHandle == nullptr) // launched from GUI return false; DWORD fileType = GetFileType(stdHandle); if (fileType == FILE_TYPE_UNKNOWN) { @@ -73,8 +73,8 @@ static bool isRedirected(HANDLE stdHandle) * (e.g. into a file), Console does not interfere. */ Console::Console() : - m_oldCout(0), - m_oldCerr(0) + m_oldCout(nullptr), + m_oldCerr(nullptr) { bool isCoutRedirected = isRedirected(GetStdHandle(STD_OUTPUT_HANDLE)); bool isCerrRedirected = isRedirected(GetStdHandle(STD_ERROR_HANDLE)); @@ -97,7 +97,7 @@ Console::Console() : | ENABLE_EXTENDED_FLAGS); # ifndef Q_CC_MINGW HMENU systemMenu = GetSystemMenu(GetConsoleWindow(), FALSE); - if (systemMenu != NULL) + if (systemMenu != nullptr) RemoveMenu(systemMenu, SC_CLOSE, MF_BYCOMMAND); DrawMenuBar(GetConsoleWindow()); # endif |