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

VcsBase: Use QtcProcess in VcsBaseSubmitEditor

Browse Source 
Replaces uses of SynchronousProcess helper functions.

Change-Id: I015306a7265248253bc37b297600adf746be9f5d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2021-05-04 07:31:50 +02:00
parent c69eb63767
commit 8b4cd1e0aa
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/vcsbase/vcsbasesubmiteditor.cpp
View File

@@ -50,7 +50,7 @@
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/icon.h> #include <utils/icon.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/synchronousprocess.h> #include <utils/qtcprocess.h>
#include <utils/temporarydirectory.h> #include <utils/temporarydirectory.h>
#include <utils/theme/theme.h> #include <utils/theme/theme.h>
@@ -654,10 +654,11 @@ bool VcsBaseSubmitEditor::runSubmitMessageCheckScript(const QString &checkScript
// Run check process // Run check process
VcsOutputWindow::appendShellCommandLine(msgCheckScript(d->m_checkScriptWorkingDirectory, VcsOutputWindow::appendShellCommandLine(msgCheckScript(d->m_checkScriptWorkingDirectory,
checkScript)); checkScript));
QProcess checkProcess; QtcProcess checkProcess;
if (!d->m_checkScriptWorkingDirectory.isEmpty()) if (!d->m_checkScriptWorkingDirectory.isEmpty())
checkProcess.setWorkingDirectory(d->m_checkScriptWorkingDirectory); checkProcess.setWorkingDirectory(d->m_checkScriptWorkingDirectory);
checkProcess.start(checkScript, QStringList(saver.fileName())); checkProcess.setCommand({checkScript, {saver.fileName()}});
checkProcess.start();
checkProcess.closeWriteChannel(); checkProcess.closeWriteChannel();
if (!checkProcess.waitForStarted()) { if (!checkProcess.waitForStarted()) {
*errorMessage = tr("The check script \"%1\" could not be started: %2").arg(checkScript, checkProcess.errorString()); *errorMessage = tr("The check script \"%1\" could not be started: %2").arg(checkScript, checkProcess.errorString());
@@ -665,8 +666,8 @@ bool VcsBaseSubmitEditor::runSubmitMessageCheckScript(const QString &checkScript
} }
QByteArray stdOutData; QByteArray stdOutData;
QByteArray stdErrData; QByteArray stdErrData;
if (!SynchronousProcess::readDataFromProcess(checkProcess, 30, &stdOutData, &stdErrData, false)) { if (!checkProcess.readDataFromProcess(30, &stdOutData, &stdErrData, false)) {
SynchronousProcess::stopProcess(checkProcess); checkProcess.stopProcess();
*errorMessage = tr("The check script \"%1\" timed out."). *errorMessage = tr("The check script \"%1\" timed out.").
arg(QDir::toNativeSeparators(checkScript)); arg(QDir::toNativeSeparators(checkScript));
return false; return false;