feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Modernize ShellCommand and SynchronousProcess

Browse Source 
* Reorder members to avoid padding
* Use C++11 member initialization

Change-Id: Ib04c2d59dfcf54f5df7afddc6e21197f1095e829
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2016-03-31 23:48:48 +03:00
committed by Orgad Shaneh
parent 39a38d5679
commit f07a309129
2 changed files with 23 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/libs/utils/synchronousprocess.cpp
View File

@@ -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())
{
}