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

QtcProcess: Limit the inclusion of qtcprocess.h

Browse Source 
Move the rest of QtcProcess enums to processenums.h.
Move ExitCodeInterpreter into processenums.h.
Remove superfluous Utils:: prefix.

Change-Id: Iaa596f353d33d6930085a621b114cc15a35caa80
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Jarek Kobus
2022-03-02 04:12:25 +01:00
parent 6ff1723c4c
commit 8e0ae8ba96
76 changed files with 335 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/clangtools/clangtoolrunner.cpp
View File

@@ -60,14 +60,14 @@ static QString finishedWithBadExitCode(const QString &name, int exitCode)
}
ClangToolRunner::ClangToolRunner(QObject *parent)
: QObject(parent), m_process(new Utils::QtcProcess)
: QObject(parent), m_process(new QtcProcess)
{}
ClangToolRunner::~ClangToolRunner()
{
if (m_process->state() != QProcess::NotRunning) {
// asking politly to terminate costs ~300 ms on windows so skip the courtasy and direct kill the process
if (Utils::HostOsInfo::isWindowsHost()) {
if (HostOsInfo::isWindowsHost()) {
m_process->kill();
m_process->waitForFinished(100);
} else {
@@ -147,10 +147,10 @@ bool ClangToolRunner::run(const QString &fileToAnalyze, const QStringList &compi
void ClangToolRunner::onProcessFinished()
{
if (m_process->result() == QtcProcess::FinishedWithSuccess) {
if (m_process->result() == ProcessResult::FinishedWithSuccess) {
qCDebug(LOG).noquote() << "Output:\n" << m_process->stdOut();
emit finishedWithSuccess(m_fileToAnalyze);
} else if (m_process->result() == QtcProcess::FinishedWithError) {
} else if (m_process->result() == ProcessResult::FinishedWithError) {
emit finishedWithFailure(finishedWithBadExitCode(m_name, m_process->exitCode()),
commandlineAndOutput());
} else { // == QProcess::CrashExit

6
src/plugins/clangtools/clangtoolrunner.h
View File

@@ -27,10 +27,14 @@
#include "clangtoolslogfilereader.h"
#include <utils/qtcprocess.h>
#include <utils/commandline.h>
#include <QProcess>
#include <memory>
namespace Utils { class QtcProcess; }
namespace ClangTools {
namespace Internal {

4
src/plugins/clangtools/executableinfo.cpp
View File

@@ -55,9 +55,9 @@ static QString runExecutable(const Utils::CommandLine &commandLine, QueryFailMod
cpp.setCommand(commandLine);
cpp.runBlocking();
if (cpp.result() != QtcProcess::FinishedWithSuccess
if (cpp.result() != ProcessResult::FinishedWithSuccess
&& (queryFailMode == QueryFailMode::Noisy
|| cpp.result() != QtcProcess::FinishedWithError)) {
|| cpp.result() != ProcessResult::FinishedWithError)) {
Core::MessageManager::writeFlashing(cpp.exitMessage());
Core::MessageManager::writeFlashing(QString::fromUtf8(cpp.allRawOutput()));
return {};