From c0333b2b6832d12352f90dfc2e14ea7b4066b17d Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Tue, 17 May 2022 01:37:46 +0200
Subject: [PATCH] FileToTransfer: Hide transferDirection from public API

Change-Id: I3df5a7f7d156385b8a6ba1cf0c9b4a216508dc20
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 src/plugins/remotelinux/filetransfer.h  |  7 -------
 src/plugins/remotelinux/linuxdevice.cpp | 22 ++++++++++++++--------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/plugins/remotelinux/filetransfer.h b/src/plugins/remotelinux/filetransfer.h
index 8560bc2a00a..9459bac1277 100644
--- a/src/plugins/remotelinux/filetransfer.h
+++ b/src/plugins/remotelinux/filetransfer.h
@@ -35,18 +35,11 @@ namespace Utils { class ProcessResultData; }
 
 namespace RemoteLinux {
 
-enum class TransferDirection {
-    Upload,
-    Download,
-    Invalid
-};
-
 class REMOTELINUX_EXPORT FileToTransfer
 {
 public:
     Utils::FilePath m_source;
     Utils::FilePath m_target;
-    TransferDirection transferDirection() const;
 };
 using FilesToTransfer = QList<FileToTransfer>;
 
diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index 24d4fb6f09f..23db2aa9fab 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -1417,23 +1417,29 @@ bool LinuxDevice::writeFileContents(const FilePath &filePath, const QByteArray &
     return d->runInShell({"dd", {"of=" + filePath.path()}}, data);
 }
 
-TransferDirection FileToTransfer::transferDirection() const
+enum class TransferDirection {
+    Upload,
+    Download,
+    Invalid
+};
+
+static TransferDirection transferDirection(const FileToTransfer &file)
 {
-    if (m_source.needsDevice() == m_target.needsDevice())
+    if (file.m_source.needsDevice() == file.m_target.needsDevice())
         return TransferDirection::Invalid;
-    return m_source.needsDevice() ? TransferDirection::Download : TransferDirection::Upload;
+    return file.m_source.needsDevice() ? TransferDirection::Download : TransferDirection::Upload;
 }
 
 static TransferDirection transferDirection(const FilesToTransfer &files)
 {
     if (files.isEmpty())
         return TransferDirection::Invalid;
-    const TransferDirection transferDirection = files.first().transferDirection();
+    const TransferDirection direction = transferDirection(files.first());
     for (const FileToTransfer &file : files) {
-        if (file.transferDirection() != transferDirection)
+        if (transferDirection(file) != direction)
             return TransferDirection::Invalid;
     }
-    return transferDirection;
+    return direction;
 }
 
 static bool isDeviceMatched(const FilePath &file, const QString &id)
@@ -1444,9 +1450,9 @@ static bool isDeviceMatched(const FilePath &file, const QString &id)
 static bool isDeviceMatched(const FilesToTransfer &files, const QString &id)
 {
     for (const FileToTransfer &file : files) {
-        if (file.transferDirection() == TransferDirection::Upload && !isDeviceMatched(file.m_target, id))
+        if (transferDirection(file) == TransferDirection::Upload && !isDeviceMatched(file.m_target, id))
             return false;
-        if (file.transferDirection() == TransferDirection::Download && !isDeviceMatched(file.m_source, id))
+        if (transferDirection(file) == TransferDirection::Download && !isDeviceMatched(file.m_source, id))
             return false;
     }
     return true;