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

QtcProcess: Extract QtcProcess specific enums into separate header

Browse Source 
Change-Id: Ib3498f189000fd8f5501130c0d280b0f5ae83849
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-02-18 00:56:14 +01:00
parent 0ee07255f5
commit 48960b5cfc
19 changed files with 102 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,16 +63,16 @@
namespace Utils {
namespace Internal {
static QString modeOption(QtcProcess::TerminalMode m)
static QString modeOption(TerminalMode m)
{
switch (m) {
case QtcProcess::TerminalRun:
case TerminalMode::Run:
return QLatin1String("run");
case QtcProcess::TerminalDebug:
case TerminalMode::Debug:
return QLatin1String("debug");
case QtcProcess::TerminalSuspend:
case TerminalMode::Suspend:
return QLatin1String("suspend");
case QtcProcess::TerminalOff:
case TerminalMode::Off:
QTC_CHECK(false);
break;
}
@@ -123,15 +123,14 @@ static QString msgCannotExecute(const QString & p, const QString &why)
class TerminalProcessPrivate
{
public:
TerminalProcessPrivate(QObject *parent, QtcProcess::ProcessImpl processImpl,
QtcProcess::TerminalMode terminalMode)
TerminalProcessPrivate(QObject *parent, ProcessImpl processImpl, TerminalMode terminalMode)
: m_terminalMode(terminalMode)
, m_process(parent)
{
m_process.setProcessImpl(processImpl);
}
const QtcProcess::TerminalMode m_terminalMode;
const TerminalMode m_terminalMode;
FilePath m_workingDir;
Environment m_environment;
qint64 m_processId = 0;
@@ -161,9 +160,9 @@ public:
#endif
};
TerminalProcess::TerminalProcess(QObject *parent, QtcProcess::ProcessImpl processImpl,
QtcProcess::TerminalMode terminalMode) :
QObject(parent), d(new TerminalProcessPrivate(this, processImpl, terminalMode))
TerminalProcess::TerminalProcess(QObject *parent, ProcessImpl processImpl,
TerminalMode terminalMode)
: QObject(parent), d(new TerminalProcessPrivate(this, processImpl, terminalMode))
{
connect(&d->m_stubServer, &QLocalServer::newConnection,
this, &TerminalProcess::stubConnectionAvailable);
@@ -211,7 +210,7 @@ void TerminalProcess::start()
QString pcmd;
QString pargs;
if (d->m_terminalMode != QtcProcess::TerminalRun) { // The debugger engines already pre-process the arguments.
if (d->m_terminalMode != TerminalMode::Run) { // The debugger engines already pre-process the arguments.
pcmd = d->m_commandLine.executable().toString();
pargs = d->m_commandLine.arguments();
} else {
@@ -376,7 +375,7 @@ void TerminalProcess::start()
emitError(QProcess::FailedToStart, tr("Quoting error in command."));
return;
}
if (d->m_terminalMode == QtcProcess::TerminalDebug) {
if (d->m_terminalMode == TerminalMode::Debug) {
// FIXME: QTCREATORBUG-2809
emitError(QProcess::FailedToStart, tr("Debugging complex shell commands in a terminal"
" is currently not supported."));