From bdaa1aaf9ed3fc93363fd66b3c99512a7d86fb4a Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 21 Apr 2017 14:59:31 +0200 Subject: [PATCH] Fix casts and null pointer style in QProcessPrivate::startProcess Using C++ casts fixes clang warnings, and using nullptr indicates what's a pointer and what's a flag. Change-Id: I17c44689f42b9af2c5ff1d9a7e3781a2243f257f Reviewed-by: Friedemann Kleint --- src/corelib/io/qprocess_win.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp index 6643e46bab..fc4d3b225d 100644 --- a/src/corelib/io/qprocess_win.cpp +++ b/src/corelib/io/qprocess_win.cpp @@ -520,10 +520,11 @@ void QProcessPrivate::startProcess() const QString nativeWorkingDirectory = QDir::toNativeSeparators(workingDirectory); QProcess::CreateProcessArguments cpargs = { - 0, (wchar_t*)args.utf16(), - 0, 0, TRUE, dwCreationFlags, - environment.isEmpty() ? 0 : envlist.data(), - nativeWorkingDirectory.isEmpty() ? Q_NULLPTR : (wchar_t*)nativeWorkingDirectory.utf16(), + nullptr, reinterpret_cast(const_cast(args.utf16())), + nullptr, nullptr, true, dwCreationFlags, + environment.isEmpty() ? nullptr : envlist.data(), + nativeWorkingDirectory.isEmpty() + ? nullptr : reinterpret_cast(nativeWorkingDirectory.utf16()), &startupInfo, pid }; success = callCreateProcess(&cpargs);