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

FileToTransfer: Hide transferDirection from public API

Browse Source 
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>
This commit is contained in:
Jarek Kobus
2022-05-17 01:37:46 +02:00
parent 08350cb8ae
commit c0333b2b68
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/remotelinux/filetransfer.h
View File

@@ -35,18 +35,11 @@ namespace Utils { class ProcessResultData; }
namespace RemoteLinux { namespace RemoteLinux {
enum class TransferDirection {
Upload,
Download,
Invalid
};
class REMOTELINUX_EXPORT FileToTransfer class REMOTELINUX_EXPORT FileToTransfer
{ {
public: public:
Utils::FilePath m_source; Utils::FilePath m_source;
Utils::FilePath m_target; Utils::FilePath m_target;
TransferDirection transferDirection() const;
}; };
using FilesToTransfer = QList<FileToTransfer>; using FilesToTransfer = QList<FileToTransfer>;

22
src/plugins/remotelinux/linuxdevice.cpp
View File

@@ -1417,23 +1417,29 @@ bool LinuxDevice::writeFileContents(const FilePath &filePath, const QByteArray &
return d->runInShell({"dd", {"of=" + filePath.path()}}, data); 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 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) static TransferDirection transferDirection(const FilesToTransfer &files)
{ {
if (files.isEmpty()) if (files.isEmpty())
return TransferDirection::Invalid; return TransferDirection::Invalid;
const TransferDirection transferDirection = files.first().transferDirection(); const TransferDirection direction = transferDirection(files.first());
for (const FileToTransfer &file : files) { for (const FileToTransfer &file : files) {
if (file.transferDirection() != transferDirection) if (transferDirection(file) != direction)
return TransferDirection::Invalid; return TransferDirection::Invalid;
} }
return transferDirection; return direction;
} }
static bool isDeviceMatched(const FilePath &file, const QString &id) 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) static bool isDeviceMatched(const FilesToTransfer &files, const QString &id)
{ {
for (const FileToTransfer &file : files) { 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; 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 false;
} }
return true; return true;