diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-02 09:35:24 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-02 23:59:03 +0200 |
commit | b73d5a0511bed8c3ccc504e74c52a61d4d3749b4 (patch) | |
tree | 9942c07e311f653792b660766bbc605e2643b546 /src/corelib/io/qprocess.h | |
parent | 013b6cf0f15b2e770a0e51be745e4484e89ea926 (diff) |
Remove typedef Q_PID
It is not used in public API any more since
0f8848b7e25e4d8fb9265ff6e0aa31946addd741.
Replace by an internal Windows-specific Q_PROCESS_INFORMATION typedef.
Change-Id: Ia6dcc83ca667c40ac5d678c00d143c09d650e42a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qprocess.h')
-rw-r--r-- | src/corelib/io/qprocess.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index 4a24f7576f..4ed01197b3 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -48,13 +48,13 @@ QT_REQUIRE_CONFIG(processenvironment); -#ifdef Q_OS_WIN -typedef struct _PROCESS_INFORMATION *Q_PID; -#endif - #if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) -typedef struct _SECURITY_ATTRIBUTES Q_SECURITY_ATTRIBUTES; -typedef struct _STARTUPINFOW Q_STARTUPINFO; +struct _PROCESS_INFORMATION; +struct _SECURITY_ATTRIBUTES; +struct _STARTUPINFOW; +using Q_PROCESS_INFORMATION = _PROCESS_INFORMATION; +using Q_SECURITY_ATTRIBUTES = _SECURITY_ATTRIBUTES; +using Q_STARTUPINFO = _STARTUPINFOW; #endif QT_BEGIN_NAMESPACE @@ -62,10 +62,6 @@ QT_BEGIN_NAMESPACE class QProcessPrivate; class QProcessEnvironmentPrivate; -#ifndef Q_OS_WIN -typedef qint64 Q_PID; -#endif - class Q_CORE_EXPORT QProcessEnvironment { public: @@ -200,7 +196,7 @@ public: void *environment; const wchar_t *currentDirectory; Q_STARTUPINFO *startupInfo; - Q_PID processInformation; + Q_PROCESS_INFORMATION *processInformation; }; typedef std::function<void(CreateProcessArguments *)> CreateProcessArgumentModifier; CreateProcessArgumentModifier createProcessArgumentsModifier() const; |