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

ProcessInterface: Use Environment and FilePath

Browse Source 
Use Utils::Environment for of environment.
Use Utils::FilePath for workingDirectory.

Change-Id: I6b717139f8ff7ddbd629fb22cf816b2303fb5e6a
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-02-14 15:54:04 +01:00
parent 95c9579c58
commit 6f1285f508
4 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/launchersocket.cpp
View File

@@ -376,7 +376,7 @@ void CallerHandle::start(const QString &program, const QStringList &arguments, c
p->command = m_command; p->command = m_command;
p->arguments = m_arguments; p->arguments = m_arguments;
p->env = m_environment.toStringList(); p->env = m_environment.toStringList();
p->workingDir = m_workingDirectory; p->workingDir = m_workingDirectory.path();
p->processMode = m_processMode; p->processMode = m_processMode;
p->writeData = m_writeData; p->writeData = m_writeData;
p->channelMode = m_channelMode; p->channelMode = m_channelMode;
@@ -456,13 +456,13 @@ void CallerHandle::setProcessChannelMode(QProcess::ProcessChannelMode mode)
m_channelMode = mode; m_channelMode = mode;
} }
void CallerHandle::setProcessEnvironment(const QProcessEnvironment &environment) void CallerHandle::setEnvironment(const Environment &environment)
{ {
QTC_ASSERT(isCalledFromCallersThread(), return); QTC_ASSERT(isCalledFromCallersThread(), return);
m_environment = environment; m_environment = environment;
} }
void CallerHandle::setWorkingDirectory(const QString &dir) void CallerHandle::setWorkingDirectory(const FilePath &dir)
{ {
QTC_ASSERT(isCalledFromCallersThread(), return); QTC_ASSERT(isCalledFromCallersThread(), return);
m_workingDirectory = dir; m_workingDirectory = dir;

10
src/libs/utils/launchersocket.h
View File

@@ -25,6 +25,8 @@
#pragma once #pragma once
#include "environment.h"
#include "filepath.h"
#include "launcherpackets.h" #include "launcherpackets.h"
#include "processutils.h" #include "processutils.h"
@@ -111,8 +113,8 @@ public:
QStringList arguments() const; QStringList arguments() const;
void setStandardInputFile(const QString &fileName); void setStandardInputFile(const QString &fileName);
void setProcessChannelMode(QProcess::ProcessChannelMode mode); void setProcessChannelMode(QProcess::ProcessChannelMode mode);
void setProcessEnvironment(const QProcessEnvironment &environment); void setEnvironment(const Environment &environment);
void setWorkingDirectory(const QString &dir); void setWorkingDirectory(const FilePath &dir);
QProcess::ExitStatus exitStatus() const; QProcess::ExitStatus exitStatus() const;
void setBelowNormalPriority(); void setBelowNormalPriority();
@@ -175,8 +177,8 @@ private:
QString m_command; QString m_command;
QStringList m_arguments; QStringList m_arguments;
QProcessEnvironment m_environment; Environment m_environment;
QString m_workingDirectory; FilePath m_workingDirectory;
QByteArray m_writeData; QByteArray m_writeData;
QProcess::ProcessChannelMode m_channelMode = QProcess::SeparateChannels; QProcess::ProcessChannelMode m_channelMode = QProcess::SeparateChannels;
QString m_standardInputFile; QString m_standardInputFile;

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

@@ -233,8 +233,8 @@ public:
QByteArray readAllStandardOutput() override { QTC_CHECK(false); return {}; } QByteArray readAllStandardOutput() override { QTC_CHECK(false); return {}; }
QByteArray readAllStandardError() override { QTC_CHECK(false); return {}; } QByteArray readAllStandardError() override { QTC_CHECK(false); return {}; }
void setProcessEnvironment(const QProcessEnvironment &) override { QTC_CHECK(false); } void setEnvironment(const Environment &) override { QTC_CHECK(false); }
void setWorkingDirectory(const QString &) override { QTC_CHECK(false); } void setWorkingDirectory(const FilePath &) override { QTC_CHECK(false); }
void start(const QString &, const QStringList &, const QByteArray &) override void start(const QString &, const QStringList &, const QByteArray &) override
{ QTC_CHECK(false); } { QTC_CHECK(false); }
void customStart(const CommandLine &command, const FilePath &workingDirectory, void customStart(const CommandLine &command, const FilePath &workingDirectory,
@@ -301,10 +301,10 @@ public:
QByteArray readAllStandardOutput() override { return m_process->readAllStandardOutput(); } QByteArray readAllStandardOutput() override { return m_process->readAllStandardOutput(); }
QByteArray readAllStandardError() override { return m_process->readAllStandardError(); } QByteArray readAllStandardError() override { return m_process->readAllStandardError(); }
void setProcessEnvironment(const QProcessEnvironment &environment) override void setEnvironment(const Environment &environment) override
{ m_process->setProcessEnvironment(environment); } { m_process->setProcessEnvironment(environment.toProcessEnvironment()); }
void setWorkingDirectory(const QString &dir) override void setWorkingDirectory(const FilePath &dir) override
{ m_process->setWorkingDirectory(dir); } { m_process->setWorkingDirectory(dir.path()); }
void start(const QString &program, const QStringList &arguments, const QByteArray &writeData) override void start(const QString &program, const QStringList &arguments, const QByteArray &writeData) override
{ {
@@ -402,9 +402,9 @@ public:
QByteArray readAllStandardOutput() override { return m_handle->readAllStandardOutput(); } QByteArray readAllStandardOutput() override { return m_handle->readAllStandardOutput(); }
QByteArray readAllStandardError() override { return m_handle->readAllStandardError(); } QByteArray readAllStandardError() override { return m_handle->readAllStandardError(); }
void setProcessEnvironment(const QProcessEnvironment &environment) override void setEnvironment(const Environment &environment) override
{ m_handle->setProcessEnvironment(environment); } { m_handle->setEnvironment(environment); }
void setWorkingDirectory(const QString &dir) override { m_handle->setWorkingDirectory(dir); } void setWorkingDirectory(const FilePath &dir) override { m_handle->setWorkingDirectory(dir); }
void start(const QString &program, const QStringList &arguments, const QByteArray &writeData) override void start(const QString &program, const QStringList &arguments, const QByteArray &writeData) override
{ {
@@ -551,8 +551,8 @@ public:
qCDebug(processLog) << "STARTING PROCESS: " << ++n << " " << commandLine.toUserOutput(); qCDebug(processLog) << "STARTING PROCESS: " << ++n << " " << commandLine.toUserOutput();
} }
m_process->setProcessEnvironment(environment.toProcessEnvironment()); m_process->setEnvironment(environment);
m_process->setWorkingDirectory(workingDirectory.path()); m_process->setWorkingDirectory(workingDirectory);
QString commandString; QString commandString;
ProcessArgs arguments; ProcessArgs arguments;

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

@@ -275,8 +275,8 @@ public:
virtual QByteArray readAllStandardOutput() = 0; virtual QByteArray readAllStandardOutput() = 0;
virtual QByteArray readAllStandardError() = 0; virtual QByteArray readAllStandardError() = 0;
virtual void setProcessEnvironment(const QProcessEnvironment &environment) = 0; virtual void setEnvironment(const Environment &environment) = 0;
virtual void setWorkingDirectory(const QString &dir) = 0; virtual void setWorkingDirectory(const FilePath &dir) = 0;
virtual void start(const QString &program, const QStringList &arguments, virtual void start(const QString &program, const QStringList &arguments,
const QByteArray &writeData) = 0; const QByteArray &writeData) = 0;
virtual void customStart(const CommandLine &, const FilePath &, virtual void customStart(const CommandLine &, const FilePath &,