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

Utils: Use some helper function in QtcProcess for common code

Browse Source 
Change-Id: Iffa720f5c6b3c86ad80c92566fbe00465d3ed7a4
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2022-05-06 11:06:13 +02:00
parent f62a4d6315
commit ef346779eb
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/utils/qtcprocess.cpp
View File

@@ -204,6 +204,8 @@ public:
void handleRest(); void handleRest();
void append(const QByteArray &text); void append(const QByteArray &text);
QByteArray readAllData() { return std::exchange(rawData, {}); }
QByteArray rawData; QByteArray rawData;
QString incompleteLineBuffer; // lines not yet signaled QString incompleteLineBuffer; // lines not yet signaled
QTextCodec *codec = nullptr; // Not owner QTextCodec *codec = nullptr; // Not owner
@@ -1501,16 +1503,12 @@ bool QtcProcess::waitForFinished(int msecs)
QByteArray QtcProcess::readAllStandardOutput() QByteArray QtcProcess::readAllStandardOutput()
{ {
QByteArray buf = d->m_stdOut.rawData; return d->m_stdOut.readAllData();
d->m_stdOut.rawData.clear();
return buf;
} }
QByteArray QtcProcess::readAllStandardError() QByteArray QtcProcess::readAllStandardError()
{ {
QByteArray buf = d->m_stdErr.rawData; return d->m_stdErr.readAllData();
d->m_stdErr.rawData.clear();
return buf;
} }
qint64 QtcProcess::write(const QString &input) qint64 QtcProcess::write(const QString &input)