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

QtcProcess: Get rid of unneeded arg from readDataFromProcess()

Browse Source 
Change-Id: Ifecf7b4a9668bc362e454a6e5084eb1d7308e4eb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Jarek Kobus
2022-07-05 18:01:44 +02:00
parent e793841b4f
commit 61258bd658
6 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1315,10 +1315,7 @@ static bool askToKill(const QString &command)
// occurs on stderr/stdout as opposed to waitForFinished()). Returns false if a timeout
// occurs. Checking of the process' exit state/code still has to be done.
bool QtcProcess::readDataFromProcess(int timeoutS,
QByteArray *stdOut,
QByteArray *stdErr,
bool showTimeOutMessageBox)
bool QtcProcess::readDataFromProcess(int timeoutS, QByteArray *stdOut, QByteArray *stdErr)
{
enum { syncDebug = 0 };
if (syncDebug)
@@ -1351,7 +1348,7 @@ bool QtcProcess::readDataFromProcess(int timeoutS,
}
// Prompt user, pretend we have data if says 'No'.
const bool hang = !hasData && !finished;
hasData = hang && showTimeOutMessageBox && !askToKill(d->m_setup.m_commandLine.executable().path());
hasData = hang && !askToKill(d->m_setup.m_commandLine.executable().path());
} while (hasData && !finished);
if (syncDebug)
qDebug() << "<readDataFromProcess" << finished;

3
src/libs/utils/qtcprocess.h
View File

@@ -175,8 +175,7 @@ public:
void setStdErrCallback(const std::function<void(const QString &)> &callback);
void setStdErrLineCallback(const std::function<void(const QString &)> &callback);
bool readDataFromProcess(int timeoutS, QByteArray *stdOut, QByteArray *stdErr,
bool showTimeOutMessageBox);
bool readDataFromProcess(int timeoutS, QByteArray *stdOut, QByteArray *stdErr);
ProcessResult result() const;
void setResult(const ProcessResult &result);

2
src/plugins/android/androidqmlpreviewworker.cpp
View File

@@ -362,7 +362,7 @@ FilePath AndroidQmlPreviewWorker::createQmlrcFile(const FilePath &workFolder,
}
QByteArray stdOut;
QByteArray stdErr;
if (!rccProcess.readDataFromProcess(30, &stdOut, &stdErr, true)) {
if (!rccProcess.readDataFromProcess(30, &stdOut, &stdErr)) {
rccProcess.stop();
rccProcess.waitForFinished();
appendMessage(tr("A timeout occurred running \"%1\"").

2
src/plugins/coreplugin/patchtool.cpp
View File

@@ -111,7 +111,7 @@ static bool runPatchHelper(const QByteArray &input, const FilePath &workingDirec
QByteArray stdOut;
QByteArray stdErr;
if (!patchProcess.readDataFromProcess(30, &stdOut, &stdErr, true)) {
if (!patchProcess.readDataFromProcess(30, &stdOut, &stdErr)) {
patchProcess.stop();
patchProcess.waitForFinished();
MessageManager::writeFlashing(

2
src/plugins/perforce/perforceplugin.cpp
View File

@@ -1328,7 +1328,7 @@ PerforceResponse PerforcePluginPrivate::fullySynchronousProcess(const FilePath &
QByteArray stdOut;
QByteArray stdErr;
const int timeOutS = (flags & LongTimeOut) ? m_settings.longTimeOutS() : m_settings.timeOutS.value();
if (!process.readDataFromProcess(timeOutS, &stdOut, &stdErr, true)) {
if (!process.readDataFromProcess(timeOutS, &stdOut, &stdErr)) {
process.stop();
process.waitForFinished();
response.error = true;

6
src/plugins/qmldesigner/generateresource.cpp
View File

@@ -254,7 +254,7 @@ void GenerateResource::generateMenuEntry(QObject *parent)
}
QByteArray stdOut;
QByteArray stdErr;
if (!rccProcess.readDataFromProcess(30, &stdOut, &stdErr, true)) {
if (!rccProcess.readDataFromProcess(30, &stdOut, &stdErr)) {
Core::MessageManager::writeDisrupting(
QCoreApplication::translate("QmlDesigner::GenerateResource",
"A timeout occurred running \"%1\"")
@@ -413,7 +413,7 @@ void GenerateResource::generateMenuEntry(QObject *parent)
}
QByteArray stdOut;
QByteArray stdErr;
if (!rccProcess.readDataFromProcess(30, &stdOut, &stdErr, true)) {
if (!rccProcess.readDataFromProcess(30, &stdOut, &stdErr)) {
Core::MessageManager::writeDisrupting(
QCoreApplication::translate("QmlDesigner::GenerateResource",
"A timeout occurred running \"%1\"")
@@ -542,7 +542,7 @@ void GenerateResource::generateMenuEntry(QObject *parent)
}
QByteArray stdOut;
QByteArray stdErr;
if (!rccProcess.readDataFromProcess(30, &stdOut, &stdErr, true)) {
if (!rccProcess.readDataFromProcess(30, &stdOut, &stdErr)) {
Core::MessageManager::writeDisrupting(
QCoreApplication::translate("QmlDesigner::GenerateResource",
"A timeout occurred running \"%1\"")