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

Tasking::Transfer: Rename Transfer into FileTransferTask

Browse Source 
Rename TransferTest into FileTransferTestTask.
Rename adapters accordingly.

Task-number: QTCREATORBUG-29102
Change-Id: I50c8b8d64abd7d3063044eaf2e0daceb01e8d388
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Jarek Kobus
2023-05-09 23:06:18 +02:00
parent c75b59f9b4
commit 2bec94ea58
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/devicesupport/filetransfer.cpp
View File

@@ -193,7 +193,7 @@ QString FileTransfer::transferMethodName(FileTransferMethod method)
return {}; return {};
} }
FileTransferAdapter::FileTransferAdapter() FileTransferTaskAdapter::FileTransferTaskAdapter()
{ {
connect(task(), &FileTransfer::done, this, [this](const ProcessResultData &result) { connect(task(), &FileTransfer::done, this, [this](const ProcessResultData &result) {
emit done(result.m_exitStatus == QProcess::NormalExit emit done(result.m_exitStatus == QProcess::NormalExit

10
src/plugins/projectexplorer/devicesupport/filetransfer.h
View File

@@ -46,14 +46,14 @@ private:
FileTransferPrivate *d; FileTransferPrivate *d;
}; };
class PROJECTEXPLORER_EXPORT FileTransferAdapter : public Utils::Tasking::TaskAdapter<FileTransfer> class PROJECTEXPLORER_EXPORT FileTransferTaskAdapter : public Utils::Tasking::TaskAdapter<FileTransfer>
{ {
public: public:
FileTransferAdapter(); FileTransferTaskAdapter();
void start() override { task()->start(); } void start() override { task()->start(); }
}; };
class PROJECTEXPLORER_EXPORT FileTransferTestAdapter : public FileTransferAdapter class PROJECTEXPLORER_EXPORT FileTransferTestTaskAdapter : public FileTransferTaskAdapter
{ {
public: public:
void start() final { task()->test(); } void start() final { task()->test(); }
@@ -61,5 +61,5 @@ public:
} // namespace ProjectExplorer } // namespace ProjectExplorer
QTC_DECLARE_CUSTOM_TASK(Transfer, ProjectExplorer::FileTransferAdapter); QTC_DECLARE_CUSTOM_TASK(FileTransferTask, ProjectExplorer::FileTransferTaskAdapter);
QTC_DECLARE_CUSTOM_TASK(TransferTest, ProjectExplorer::FileTransferTestAdapter); QTC_DECLARE_CUSTOM_TASK(FileTransferTestTask, ProjectExplorer::FileTransferTestTaskAdapter);

2
src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp
View File

@@ -193,7 +193,7 @@ TaskItem QnxDeployQtLibrariesDialogPrivate::uploadTask()
const auto errorHandler = [this](const FileTransfer &transfer) { const auto errorHandler = [this](const FileTransfer &transfer) {
emitErrorMessage(transfer.resultData().m_errorString); emitErrorMessage(transfer.resultData().m_errorString);
}; };
return Transfer(setupHandler, {}, errorHandler); return FileTransferTask(setupHandler, {}, errorHandler);
} }
TaskItem QnxDeployQtLibrariesDialogPrivate::chmodTask(const DeployableFile &file) TaskItem QnxDeployQtLibrariesDialogPrivate::chmodTask(const DeployableFile &file)

2
src/plugins/remotelinux/genericdirectuploadstep.cpp
View File

@@ -226,7 +226,7 @@ TaskItem GenericDirectUploadStep::uploadTask(const TreeStorage<UploadStorage> &s
addErrorMessage(transfer.resultData().m_errorString); addErrorMessage(transfer.resultData().m_errorString);
}; };
return Transfer(setupHandler, {}, errorHandler); return FileTransferTask(setupHandler, {}, errorHandler);
} }
TaskItem GenericDirectUploadStep::chmodTask(const DeployableFile &file) TaskItem GenericDirectUploadStep::chmodTask(const DeployableFile &file)

2
src/plugins/remotelinux/linuxdevicetester.cpp
View File

@@ -213,7 +213,7 @@ TaskItem GenericLinuxDeviceTesterPrivate::transferTask(FileTransferMethod method
.arg(generic, sftp, rsync)); .arg(generic, sftp, rsync));
} }
}; };
return TransferTest(setup, done, error); return FileTransferTestTask(setup, done, error);
} }
TaskItem GenericLinuxDeviceTesterPrivate::transferTasks() const TaskItem GenericLinuxDeviceTesterPrivate::transferTasks() const

2
src/plugins/remotelinux/rsyncdeploystep.cpp
View File

@@ -134,7 +134,7 @@ TaskItem RsyncDeployStep::transferTask()
+ "\n" + result.m_errorString); + "\n" + result.m_errorString);
} }
}; };
return Transfer(setupHandler, {}, errorHandler); return FileTransferTask(setupHandler, {}, errorHandler);
} }
Group RsyncDeployStep::deployRecipe() Group RsyncDeployStep::deployRecipe()

2
src/plugins/remotelinux/tarpackagedeploystep.cpp
View File

@@ -87,7 +87,7 @@ TaskItem TarPackageDeployStep::uploadTask()
const ProcessResultData result = transfer.resultData(); const ProcessResultData result = transfer.resultData();
addErrorMessage(result.m_errorString); addErrorMessage(result.m_errorString);
}; };
return Transfer(setupHandler, doneHandler, errorHandler); return FileTransferTask(setupHandler, doneHandler, errorHandler);
} }
TaskItem TarPackageDeployStep::installTask() TaskItem TarPackageDeployStep::installTask()