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

RemoteLinux: Drop some in-class signalling

Browse Source 
Not needed since the deploy step and service hierarchy merge.

Change-Id: I644bdeca31caa2182b9d618e5f1ec6865c95f4c8
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2023-03-22 09:34:34 +01:00
parent a4ed630c7d
commit c6b6e5b0c6
10 changed files with 73 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
View File

@@ -40,19 +40,8 @@ public:
using namespace Internal;
AbstractRemoteLinuxDeployStep::AbstractRemoteLinuxDeployStep(BuildStepList *bsl, Id id)
: BuildStep(bsl, id), d(new Internal::AbstractRemoteLinuxDeployStepPrivate)
{
connect(this, &AbstractRemoteLinuxDeployStep::errorMessage,
this, &AbstractRemoteLinuxDeployStep::handleErrorMessage);
connect(this, &AbstractRemoteLinuxDeployStep::progressMessage,
this, &AbstractRemoteLinuxDeployStep::handleProgressMessage);
connect(this, &AbstractRemoteLinuxDeployStep::warningMessage,
this, &AbstractRemoteLinuxDeployStep::handleWarningMessage);
connect(this, &AbstractRemoteLinuxDeployStep::stdOutData,
this, &AbstractRemoteLinuxDeployStep::handleStdOutData);
connect(this, &AbstractRemoteLinuxDeployStep::stdErrData,
this, &AbstractRemoteLinuxDeployStep::handleStdErrData);
}
: BuildStep(bsl, id), d(new AbstractRemoteLinuxDeployStepPrivate)
{}
AbstractRemoteLinuxDeployStep::~AbstractRemoteLinuxDeployStep()
{
@@ -88,13 +77,13 @@ void AbstractRemoteLinuxDeployStep::start()
const CheckResult check = isDeploymentPossible();
if (!check) {
emit errorMessage(check.errorMessage());
addErrorMessage(check.errorMessage());
handleFinished();
return;
}
if (!isDeploymentNecessary()) {
emit progressMessage(Tr::tr("No deployment action necessary. Skipping."));
addProgressMessage(Tr::tr("No deployment action necessary. Skipping."));
handleFinished();
return;
}
@@ -190,19 +179,19 @@ void AbstractRemoteLinuxDeployStep::doCancel()
stop();
}
void AbstractRemoteLinuxDeployStep::handleProgressMessage(const QString &message)
void AbstractRemoteLinuxDeployStep::addProgressMessage(const QString &message)
{
emit addOutput(message, OutputFormat::NormalMessage);
}
void AbstractRemoteLinuxDeployStep::handleErrorMessage(const QString &message)
void AbstractRemoteLinuxDeployStep::addErrorMessage(const QString &message)
{
emit addOutput(message, OutputFormat::ErrorMessage);
emit addTask(DeploymentTask(Task::Error, message), 1); // TODO correct?
d->hasError = true;
}
void AbstractRemoteLinuxDeployStep::handleWarningMessage(const QString &message)
void AbstractRemoteLinuxDeployStep::addWarningMessage(const QString &message)
{
emit addOutput(message, OutputFormat::ErrorMessage);
emit addTask(DeploymentTask(Task::Warning, message), 1); // TODO correct?
@@ -214,6 +203,7 @@ void AbstractRemoteLinuxDeployStep::handleFinished()
emit addOutput(Tr::tr("Deploy step failed."), OutputFormat::ErrorMessage);
else
emit addOutput(Tr::tr("Deploy step finished."), OutputFormat::NormalMessage);
emit finished(!d->hasError);
}