diff --git a/src/plugins/remotelinux/genericdirectuploadservice.cpp b/src/plugins/remotelinux/genericdirectuploadservice.cpp index 9839adccb7f..e9cfaf5dc71 100644 --- a/src/plugins/remotelinux/genericdirectuploadservice.cpp +++ b/src/plugins/remotelinux/genericdirectuploadservice.cpp @@ -50,11 +50,10 @@ class GenericDirectUploadServicePrivate { public: GenericDirectUploadServicePrivate() - : incremental(false), ignoreMissingFiles(false), stopRequested(false), state(Inactive) {} + : incremental(false), ignoreMissingFiles(false), state(Inactive) {} bool incremental; bool ignoreMissingFiles; - bool stopRequested; State state; QList filesToUpload; SftpChannel::Ptr uploader; @@ -132,12 +131,6 @@ void GenericDirectUploadService::handleSftpInitialized() { QTC_ASSERT(d->state == InitializingSftp, setFinished(); return); - if (d->stopRequested) { - setFinished(); - handleDeploymentDone(); - return; - } - Q_ASSERT(!d->filesToUpload.isEmpty()); connect(d->uploader.data(), &SftpChannel::finished, this, &GenericDirectUploadService::handleUploadFinished); @@ -160,11 +153,6 @@ void GenericDirectUploadService::handleUploadFinished(SftpJobId jobId, const QSt QTC_ASSERT(d->state == Uploading, setFinished(); return); - if (d->stopRequested) { - setFinished(); - handleDeploymentDone(); - } - const DeployableFile df = d->filesToUpload.takeFirst(); if (!errorMsg.isEmpty()) { QString errorString = tr("Upload of file \"%1\" failed. The server said: \"%2\".") @@ -204,11 +192,6 @@ void GenericDirectUploadService::handleLnFinished(int exitStatus) { QTC_ASSERT(d->state == Uploading, setFinished(); return); - if (d->stopRequested) { - setFinished(); - handleDeploymentDone(); - } - const DeployableFile df = d->filesToUpload.takeFirst(); const QString nativePath = df.localFilePath().toUserOutput(); if (exitStatus != SshRemoteProcess::NormalExit || d->lnProc->exitCode() != 0) { @@ -226,12 +209,6 @@ void GenericDirectUploadService::handleChmodFinished(int exitStatus) { QTC_ASSERT(d->state == Uploading, setFinished(); return); - if (d->stopRequested) { - setFinished(); - handleDeploymentDone(); - return; - } - if (exitStatus != SshRemoteProcess::NormalExit || d->chmodProc->exitCode() != 0) { emit errorMessage(tr("Failed to set executable flag.")); setFinished(); @@ -245,11 +222,6 @@ void GenericDirectUploadService::handleMkdirFinished(int exitStatus) { QTC_ASSERT(d->state == Uploading, setFinished(); return); - if (d->stopRequested) { - setFinished(); - handleDeploymentDone(); - } - const DeployableFile &df = d->filesToUpload.first(); QFileInfo fi = df.localFilePath().toFileInfo(); const QString nativePath = df.localFilePath().toUserOutput(); @@ -351,7 +323,6 @@ void GenericDirectUploadService::checkDeploymentNeeded(const DeployableFile &dep void GenericDirectUploadService::setFinished() { - d->stopRequested = false; d->state = Inactive; if (d->mkdirProc) disconnect(d->mkdirProc.data(), 0, this, 0);