SftpTransfer: Get rid of FileTransferErrorHandling enum

FileTransferErrorHandling::Ignore wasn't used anywhere.

Change-Id: I5826fc9f7871b06cd8f423d7e3b1d01a5b6cbdff
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

src/libs/ssh/sftpdefs.h

@@ -38,8 +38,6 @@ namespace QSsh {
 class SftpTransfer;
 using SftpTransferPtr = std::unique_ptr<SftpTransfer>;
 
-enum class FileTransferErrorHandling { Abort, Ignore };
-
 class FileToTransfer
 {
 public:

src/libs/ssh/sftptransfer.cpp

@@ -48,7 +48,6 @@ struct SftpTransfer::SftpTransferPrivate
     QtcProcess sftpProc;
     FilesToTransfer files;
     Internal::FileTransferType transferType;
-    FileTransferErrorHandling errorHandlingMode;
     QStringList connectionArgs;
     QString batchFilePath;
 
@@ -82,8 +81,6 @@ struct SftpTransfer::SftpTransferPrivate
             command = "get";
             break;
         }
-        if (errorHandlingMode == FileTransferErrorHandling::Ignore)
-            command.prepend('-');
         return command;
     }
 };
@@ -106,14 +103,12 @@ void SftpTransfer::stop()
 }
 
 SftpTransfer::SftpTransfer(const FilesToTransfer &files, Internal::FileTransferType type,
-                           FileTransferErrorHandling errorHandlingMode,
                            const QStringList &connectionArgs)
     : d(new SftpTransferPrivate)
 {
     SshConnectionParameters::setupSshEnvironment(&d->sftpProc);
     d->files = files;
     d->transferType = type;
-    d->errorHandlingMode = errorHandlingMode;
     d->connectionArgs = connectionArgs;
     connect(&d->sftpProc, &QtcProcess::done, [this] {
         if (d->sftpProc.error() == QProcess::FailedToStart) {

src/libs/ssh/sftptransfer.h

@@ -50,7 +50,6 @@ signals:
 
 private:
     SftpTransfer(const FilesToTransfer &files, Internal::FileTransferType type,
-                 FileTransferErrorHandling errorHandlingMode,
                  const QStringList &connectionArgs);
     void doStart();
     void emitError(const QString &details);

src/libs/ssh/sshconnection.cpp

@@ -287,16 +287,14 @@ SshConnection::~SshConnection()
     delete d;
 }
 
-SftpTransferPtr SshConnection::createUpload(const FilesToTransfer &files,
-                                            FileTransferErrorHandling errorHandlingMode)
+SftpTransferPtr SshConnection::createUpload(const FilesToTransfer &files)
 {
-    return setupTransfer(files, Internal::FileTransferType::Upload, errorHandlingMode);
+    return setupTransfer(files, Internal::FileTransferType::Upload);
 }
 
-SftpTransferPtr SshConnection::createDownload(const FilesToTransfer &files,
-                                              FileTransferErrorHandling errorHandlingMode)
+SftpTransferPtr SshConnection::createDownload(const FilesToTransfer &files)
 {
-    return setupTransfer(files, Internal::FileTransferType::Download, errorHandlingMode);
+    return setupTransfer(files, Internal::FileTransferType::Download);
 }
 
 void SshConnection::doConnectToHost()
@@ -355,12 +353,11 @@ void SshConnection::emitDisconnected()
     emit disconnected();
 }
 
-SftpTransferPtr SshConnection::setupTransfer(
-        const FilesToTransfer &files, Internal::FileTransferType type,
-        FileTransferErrorHandling errorHandlingMode)
+SftpTransferPtr SshConnection::setupTransfer(const FilesToTransfer &files,
+                                             Internal::FileTransferType type)
 {
     QTC_ASSERT(state() == Connected, return SftpTransferPtr());
-    return SftpTransferPtr(new SftpTransfer(files, type, errorHandlingMode,
+    return SftpTransferPtr(new SftpTransfer(files, type,
                                             d->connectionArgs(SshSettings::sftpFilePath())));
 }
 

src/libs/ssh/sshconnection.h

@@ -99,10 +99,8 @@ public:
     bool sharingEnabled() const;
     ~SshConnection();
 
-    SftpTransferPtr createUpload(const FilesToTransfer &files,
-                                 FileTransferErrorHandling errorHandlingMode);
-    SftpTransferPtr createDownload(const FilesToTransfer &files,
-                                   FileTransferErrorHandling errorHandlingMode);
+    SftpTransferPtr createUpload(const FilesToTransfer &files);
+    SftpTransferPtr createDownload(const FilesToTransfer &files);
 
 signals:
     void connected();
@@ -114,8 +112,7 @@ private:
     void emitError(const QString &reason);
     void emitConnected();
     void emitDisconnected();
-    SftpTransferPtr setupTransfer(const FilesToTransfer &files, Internal::FileTransferType type,
-                                  FileTransferErrorHandling errorHandlingMode);
+    SftpTransferPtr setupTransfer(const FilesToTransfer &files, Internal::FileTransferType type);
 
     struct SshConnectionPrivate;
     SshConnectionPrivate * const d;

src/plugins/remotelinux/genericdirectuploadservice.cpp

@@ -310,7 +310,7 @@ void GenericDirectUploadService::uploadFiles()
         }
         filesToTransfer << FileToTransfer(f.localFilePath().toString(), f.remoteFilePath());
     }
-    d->uploader = connection()->createUpload(filesToTransfer, FileTransferErrorHandling::Abort);
+    d->uploader = connection()->createUpload(filesToTransfer);
     connect(d->uploader.get(), &SftpTransfer::done, [this](const QString &error) {
         QTC_ASSERT(d->state == Uploading, return);
         if (!error.isEmpty()) {

src/plugins/remotelinux/linuxdevicetester.cpp

@@ -193,8 +193,7 @@ void GenericLinuxDeviceTester::handlePortListReady()
     }
 
     emit progressMessage(tr("Checking whether an SFTP connection can be set up..."));
-    d->sftpTransfer = d->connection->createDownload(FilesToTransfer(),
-                                                    FileTransferErrorHandling::Abort);
+    d->sftpTransfer = d->connection->createDownload(FilesToTransfer());
     connect(d->sftpTransfer.get(), &SftpTransfer::done,
             this, &GenericLinuxDeviceTester::handleSftpFinished);
     d->state = TestingSftp;

src/plugins/remotelinux/packageuploader.cpp

@@ -52,8 +52,7 @@ void PackageUploader::uploadPackage(SshConnection *connection,
     m_connection = connection;
     connect(m_connection, &SshConnection::errorOccurred,
             this, &PackageUploader::handleConnectionFailure);
-    m_uploader = m_connection->createUpload({FileToTransfer(localFilePath, remoteFilePath)},
-                                            FileTransferErrorHandling::Abort);
+    m_uploader = m_connection->createUpload({FileToTransfer(localFilePath, remoteFilePath)});
     connect(m_uploader.get(), &SftpTransfer::done, this, &PackageUploader::handleUploadDone);
     m_uploader->start();
 }

tests/auto/ssh/tst_ssh.cpp

@@ -203,8 +203,7 @@ void tst_Ssh::sftp()
     QVERIFY2(bigFile.error() == QFile::NoError, qPrintable(bigFile.errorString()));
     filesToUpload << FileToTransfer(bigFile.fileName(), getRemoteFilePath(bigFileName));
 
-    const SftpTransferPtr upload = connection.createUpload(filesToUpload,
-                                                           FileTransferErrorHandling::Abort);
+    const SftpTransferPtr upload = connection.createUpload(filesToUpload);
     QString jobError;
     QEventLoop loop;
     connect(upload.get(), &SftpTransfer::done, [&jobError, &loop](const QString &error) {