From ef346779eb500c3661fb46fa0722e9270d6adecf Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 6 May 2022 11:06:13 +0200 Subject: [PATCH] Utils: Use some helper function in QtcProcess for common code Change-Id: Iffa720f5c6b3c86ad80c92566fbe00465d3ed7a4 Reviewed-by: Jarek Kobus --- src/libs/utils/qtcprocess.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index 2d7a4bfb60a..309294403e4 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -204,6 +204,8 @@ public: void handleRest(); void append(const QByteArray &text); + QByteArray readAllData() { return std::exchange(rawData, {}); } + QByteArray rawData; QString incompleteLineBuffer; // lines not yet signaled QTextCodec *codec = nullptr; // Not owner @@ -1501,16 +1503,12 @@ bool QtcProcess::waitForFinished(int msecs) QByteArray QtcProcess::readAllStandardOutput() { - QByteArray buf = d->m_stdOut.rawData; - d->m_stdOut.rawData.clear(); - return buf; + return d->m_stdOut.readAllData(); } QByteArray QtcProcess::readAllStandardError() { - QByteArray buf = d->m_stdErr.rawData; - d->m_stdErr.rawData.clear(); - return buf; + return d->m_stdErr.readAllData(); } qint64 QtcProcess::write(const QString &input)