summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer/abstractprocessstep.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2020-07-28 07:52:22 +0200
committerhjk <hjk@qt.io>2020-07-28 11:59:22 +0000
commit0e5cc282e612d6fa9a35b019e3599cf68319fd9a (patch)
treeb34f1926b6a5e86ea9466cc3b9f977efa3a04304 /src/plugins/projectexplorer/abstractprocessstep.cpp
parentfdd70d898dbe1b0278fc47b59e3b541db2339155 (diff)
downloadqt-creator-0e5cc282e612d6fa9a35b019e3599cf68319fd9a.tar.gz
ProjectExplorer: Small code cosmetics
Unused declaration, const, .. Change-Id: I0de544ba9be36a291fec5d1ab187e038a4fcc464 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/abstractprocessstep.cpp')
-rw-r--r--src/plugins/projectexplorer/abstractprocessstep.cpp22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp
index 7b1dd44d3c..cd7558b6a0 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.cpp
+++ b/src/plugins/projectexplorer/abstractprocessstep.cpp
@@ -103,6 +103,8 @@ class AbstractProcessStep::Private
public:
Private(AbstractProcessStep *q) : q(q) {}
+ void cleanUp(QProcess *process);
+
AbstractProcessStep *q;
std::unique_ptr<Utils::QtcProcess> m_process;
ProcessParameters m_param;
@@ -130,7 +132,7 @@ void AbstractProcessStep::emitFaultyConfigurationMessage()
BuildStep::OutputFormat::NormalMessage);
}
-bool AbstractProcessStep::ignoreReturnValue()
+bool AbstractProcessStep::ignoreReturnValue() const
{
return d->m_ignoreReturnValue;
}
@@ -240,16 +242,17 @@ ProcessParameters *AbstractProcessStep::processParameters()
return &d->m_param;
}
-void AbstractProcessStep::cleanUp(QProcess *process)
+void AbstractProcessStep::Private::cleanUp(QProcess *process)
{
// The process has finished, leftover data is read in processFinished
- processFinished(process->exitCode(), process->exitStatus());
- const bool returnValue = processSucceeded(process->exitCode(), process->exitStatus()) || d->m_ignoreReturnValue;
+ q->processFinished(process->exitCode(), process->exitStatus());
+ const bool returnValue = q->processSucceeded(process->exitCode(), process->exitStatus())
+ || m_ignoreReturnValue;
- d->m_process.reset();
+ m_process.reset();
// Report result
- finish(returnValue);
+ q->finish(returnValue);
}
/*!
@@ -355,11 +358,6 @@ void AbstractProcessStep::finish(bool success)
emit finished(success);
}
-void AbstractProcessStep::outputAdded(const QString &string, BuildStep::OutputFormat format)
-{
- emit addOutput(string, format, BuildStep::DontAppendNewline);
-}
-
void AbstractProcessStep::slotProcessFinished(int, QProcess::ExitStatus)
{
QProcess *process = d->m_process.get();
@@ -369,7 +367,7 @@ void AbstractProcessStep::slotProcessFinished(int, QProcess::ExitStatus)
stdError(d->stderrStream->toUnicode(process->readAllStandardError()));
stdOutput(d->stdoutStream->toUnicode(process->readAllStandardOutput()));
}
- cleanUp(process);
+ d->cleanUp(process);
}
} // namespace ProjectExplorer