diff --git a/src/libs/utils/shellcommand.cpp b/src/libs/utils/shellcommand.cpp index b9366adb5c7..99a09e7e14f 100644 --- a/src/libs/utils/shellcommand.cpp +++ b/src/libs/utils/shellcommand.cpp @@ -85,34 +85,25 @@ public: const QString m_defaultWorkingDirectory; const QProcessEnvironment m_environment; QVariant m_cookie; - int m_defaultTimeoutS; - unsigned m_flags; - QTextCodec *m_codec; - ProgressParser *m_progressParser; - bool m_progressiveOutput; - bool m_hadOutput; - bool m_aborted; + QTextCodec *m_codec = nullptr; + ProgressParser *m_progressParser = nullptr; QFutureWatcher m_watcher; - QList m_jobs; - bool m_lastExecSuccess; - int m_lastExecExitCode; + unsigned m_flags = 0; + int m_defaultTimeoutS = 10; + int m_lastExecExitCode = -1; + + bool m_lastExecSuccess = false; + bool m_progressiveOutput = false; + bool m_hadOutput = false; + bool m_aborted = false; }; ShellCommandPrivate::ShellCommandPrivate(const QString &defaultWorkingDirectory, const QProcessEnvironment &environment) : m_defaultWorkingDirectory(defaultWorkingDirectory), - m_environment(environment), - m_defaultTimeoutS(10), - m_flags(0), - m_codec(0), - m_progressParser(0), - m_progressiveOutput(false), - m_hadOutput(false), - m_aborted(false), - m_lastExecSuccess(false), - m_lastExecExitCode(-1) + m_environment(environment) { } ShellCommandPrivate::~ShellCommandPrivate() diff --git a/src/libs/utils/synchronousprocess.cpp b/src/libs/utils/synchronousprocess.cpp index 8e381d117cf..b4e156bf6a5 100644 --- a/src/libs/utils/synchronousprocess.cpp +++ b/src/libs/utils/synchronousprocess.cpp @@ -153,24 +153,16 @@ SynchronousProcessResponse::Result ExitCodeInterpreter::interpretExitCode(int co // Data for one channel buffer (stderr/stdout) struct ChannelBuffer { - ChannelBuffer(); void clearForRun(); QString linesRead(); QString data; - bool firstData; - bool bufferedSignalsEnabled; - bool firstBuffer; - int bufferPos; + int bufferPos = 0; + bool firstData = true; + bool bufferedSignalsEnabled = false; + bool firstBuffer = true; }; -ChannelBuffer::ChannelBuffer() : - firstData(true), - bufferedSignalsEnabled(false), - firstBuffer(true), - bufferPos(0) -{ -} void ChannelBuffer::clearForRun() { @@ -200,32 +192,26 @@ struct SynchronousProcessPrivate { void clearForRun(); QTextCodec *m_codec; - ExitCodeInterpreter *m_exitCodeInterpreter; + ExitCodeInterpreter *m_exitCodeInterpreter = nullptr; QTextCodec::ConverterState m_stdOutState; QTextCodec::ConverterState m_stdErrState; TerminalControllingProcess m_process; QTimer m_timer; QEventLoop m_eventLoop; SynchronousProcessResponse m_result; - int m_hangTimerCount; - int m_maxHangTimerCount; - bool m_startFailure; - bool m_timeOutMessageBoxEnabled; - bool m_waitingForUser; QString m_binary; - ChannelBuffer m_stdOut; ChannelBuffer m_stdErr; + + int m_hangTimerCount = 0; + int m_maxHangTimerCount = defaultMaxHangTimerCount; + bool m_startFailure = false; + bool m_timeOutMessageBoxEnabled = false; + bool m_waitingForUser = false; }; SynchronousProcessPrivate::SynchronousProcessPrivate() : - m_codec(QTextCodec::codecForLocale()), - m_exitCodeInterpreter(0), - m_hangTimerCount(0), - m_maxHangTimerCount(defaultMaxHangTimerCount), - m_startFailure(false), - m_timeOutMessageBoxEnabled(false), - m_waitingForUser(false) + m_codec(QTextCodec::codecForLocale()) { }