From b9f4a0e7e4153b8dc46749374de62461ee6d9d57 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 18 Aug 2021 16:59:47 +0200 Subject: [PATCH] RemoteLinux: Simplify GenericDirectUploadService::collectFilesToUpload() Change-Id: I50407575501f108ec442a0ccbdbd321aaa1281c5 Reviewed-by: Christian Kandeler --- .../remotelinux/genericdirectuploadservice.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/plugins/remotelinux/genericdirectuploadservice.cpp b/src/plugins/remotelinux/genericdirectuploadservice.cpp index d8996568a41..5cb7f00b7d6 100644 --- a/src/plugins/remotelinux/genericdirectuploadservice.cpp +++ b/src/plugins/remotelinux/genericdirectuploadservice.cpp @@ -43,6 +43,7 @@ using namespace ProjectExplorer; using namespace QSsh; +using namespace Utils; namespace RemoteLinux { namespace Internal { @@ -232,17 +233,12 @@ QList GenericDirectUploadService::collectFilesToUpload( const DeployableFile &deployable) const { QList collected; - QFileInfo fileInfo = deployable.localFilePath().toFileInfo(); - if (fileInfo.isDir()) { - const QStringList files = QDir(deployable.localFilePath().toString()) - .entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot); - for (const QString &fileName : files) { - const QString localFilePath = deployable.localFilePath().toString() - + QLatin1Char('/') + fileName; - const QString remoteDir = deployable.remoteDirectory() + QLatin1Char('/') - + fileInfo.fileName(); + FilePath localFile = deployable.localFilePath(); + if (localFile.isDir()) { + const FilePaths files = localFile.dirEntries(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot); + const QString remoteDir = deployable.remoteDirectory() + '/' + localFile.fileName(); + for (const FilePath &localFilePath : files) collected.append(collectFilesToUpload(DeployableFile(localFilePath, remoteDir))); - } } else { collected << deployable; }