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

TerminalImpl: Drop ProcessImpl and Terminal mode from c'tor

Browse Source 
Change-Id: I0571eabb1a20389055a8e98dd942776b3d054981
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-02-21 15:52:03 +01:00
parent 02d9a9b7b7
commit d502f78c4f
3 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/libs/utils/terminalprocess.cpp
View File

@@ -123,14 +123,10 @@ static QString msgCannotExecute(const QString & p, const QString &why)
class TerminalProcessPrivate
{
public:
TerminalProcessPrivate(QObject *parent, ProcessImpl processImpl, TerminalMode terminalMode)
: m_terminalMode(terminalMode)
, m_process(parent)
{
m_process.setProcessImpl(processImpl);
}
TerminalProcessPrivate(QObject *parent)
: m_process(parent) {}
const TerminalMode m_terminalMode;
TerminalMode m_terminalMode = TerminalMode::On;
FilePath m_workingDir;
Environment m_environment;
qint64 m_processId = 0;
@@ -160,9 +156,8 @@ public:
#endif
};
TerminalProcess::TerminalProcess(QObject *parent, ProcessImpl processImpl,
TerminalMode terminalMode)
: QObject(parent), d(new TerminalProcessPrivate(this, processImpl, terminalMode))
TerminalProcess::TerminalProcess(QObject *parent)
: QObject(parent), d(new TerminalProcessPrivate(this))
{
connect(&d->m_stubServer, &QLocalServer::newConnection,
this, &TerminalProcess::stubConnectionAvailable);
@@ -176,6 +171,17 @@ TerminalProcess::~TerminalProcess()
delete d;
}
void TerminalProcess::setProcessImpl(ProcessImpl processImpl)
{
d->m_process.setProcessImpl(processImpl);
}
void TerminalProcess::setTerminalMode(TerminalMode mode)
{
QTC_ASSERT(mode != TerminalMode::Off, return);
d->m_terminalMode = mode;
}
void TerminalProcess::setCommand(const CommandLine &command)
{
d->m_commandLine = command;