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

ProjectExplorer: Small code cosmetics

Browse Source 
Unused declaration, const, ..

Change-Id: I0de544ba9be36a291fec5d1ab187e038a4fcc464
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-07-28 07:52:22 +02:00
parent fdd70d898d
commit 0e5cc282e6
2 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/projectexplorer/abstractprocessstep.cpp
View File

@@ -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

15
src/plugins/projectexplorer/abstractprocessstep.h
View File

@@ -29,9 +29,7 @@
#include <QProcess>
namespace Utils { class FilePath; }
namespace ProjectExplorer {
class OutputTaskParser;
class ProcessParameters;
// Documentation inside.
@@ -42,7 +40,7 @@ class PROJECTEXPLORER_EXPORT AbstractProcessStep : public BuildStep
public:
ProcessParameters *processParameters();
bool ignoreReturnValue();
bool ignoreReturnValue() const;
void setIgnoreReturnValue(bool b);
void emitFaultyConfigurationMessage();
@@ -50,12 +48,14 @@ public:
protected:
AbstractProcessStep(BuildStepList *bsl, Utils::Id id);
~AbstractProcessStep() override;
bool init() override;
void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
void doRun() override;
void doCancel() override;
void setLowPriority();
virtual void finish(bool success);
virtual void finish(bool success);
virtual void processStarted();
virtual void processFinished(int exitCode, QProcess::ExitStatus status);
virtual void processStartupFailed();
@@ -63,18 +63,11 @@ protected:
virtual void stdOutput(const QString &output);
virtual void stdError(const QString &output);
void doCancel() override;
private:
void processReadyReadStdOutput();
void processReadyReadStdError();
void slotProcessFinished(int, QProcess::ExitStatus);
void cleanUp(QProcess *process);
void outputAdded(const QString &string, BuildStep::OutputFormat format);
class Private;
Private *d;
};