From 8a8b50e8b5d8788e917c3d24db10ef29c4a5462e Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 8 Feb 2023 08:21:41 +0100 Subject: [PATCH] ProjectExplorer: Proliferate Utils::FilePath use Move the .toString() uses into DeploymentData::addFilesFromDeploymentFile Change-Id: Ic9ef22da1918ca105c92f0231960dab27b0d80bb Reviewed-by: Christian Kandeler --- src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp | 3 +-- .../compilationdatabaseproject.cpp | 3 +-- src/plugins/genericprojectmanager/genericproject.cpp | 3 +-- src/plugins/projectexplorer/deploymentdata.cpp | 7 ++++--- src/plugins/projectexplorer/deploymentdata.h | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index b89f6471d1c..0e2f74a1c95 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -1086,8 +1086,7 @@ DeploymentData CMakeBuildSystem::deploymentData() const if (!hasDeploymentFile) return result; - deploymentPrefix = result.addFilesFromDeploymentFile(deploymentFilePath.toString(), - sourceDir.toString()); + deploymentPrefix = result.addFilesFromDeploymentFile(deploymentFilePath, sourceDir); for (const CMakeBuildTarget &ct : m_buildTargets) { if (ct.targetType == ExecutableType || ct.targetType == DynamicLibraryType) { if (!ct.executable.isEmpty() diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp index 2606791942f..5f23238d7b8 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp @@ -460,8 +460,7 @@ void CompilationDatabaseBuildSystem::updateDeploymentData() const Utils::FilePath deploymentFilePath = projectDirectory() .pathAppended("QtCreatorDeployment.txt"); DeploymentData deploymentData; - deploymentData.addFilesFromDeploymentFile(deploymentFilePath.toString(), - projectDirectory().toString()); + deploymentData.addFilesFromDeploymentFile(deploymentFilePath, projectDirectory()); setDeploymentData(deploymentData); if (m_deployFileWatcher->files() != QStringList(deploymentFilePath.toString())) { m_deployFileWatcher->clear(); diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index b0dc38ae7c7..518b765bcb2 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -599,8 +599,7 @@ void GenericBuildSystem::updateDeploymentData() } if (hasDeploymentData) { DeploymentData deploymentData; - deploymentData.addFilesFromDeploymentFile(deploymentFilePath.toString(), - projectDirectory().toString()); + deploymentData.addFilesFromDeploymentFile(deploymentFilePath, projectDirectory()); setDeploymentData(deploymentData); if (m_deployFileWatcher.filePaths() != FilePaths{deploymentFilePath}) { m_deployFileWatcher.clear(); diff --git a/src/plugins/projectexplorer/deploymentdata.cpp b/src/plugins/projectexplorer/deploymentdata.cpp index 07894b2a249..28626babab0 100644 --- a/src/plugins/projectexplorer/deploymentdata.cpp +++ b/src/plugins/projectexplorer/deploymentdata.cpp @@ -48,11 +48,12 @@ bool DeploymentData::operator==(const DeploymentData &other) const && m_localInstallRoot == other.m_localInstallRoot; } -QString DeploymentData::addFilesFromDeploymentFile(const QString &deploymentFilePath, - const QString &sourceDir) +QString DeploymentData::addFilesFromDeploymentFile(const FilePath &deploymentFilePath, + const FilePath &sourceDir_) { + const QString sourceDir = sourceDir_.toString(); const QString sourcePrefix = sourceDir.endsWith('/') ? sourceDir : sourceDir + '/'; - QFile deploymentFile(deploymentFilePath); + QFile deploymentFile(deploymentFilePath.toString()); QTextStream deploymentStream; QString deploymentPrefix; diff --git a/src/plugins/projectexplorer/deploymentdata.h b/src/plugins/projectexplorer/deploymentdata.h index 522b40d153b..9ffffb0885b 100644 --- a/src/plugins/projectexplorer/deploymentdata.h +++ b/src/plugins/projectexplorer/deploymentdata.h @@ -34,7 +34,7 @@ public: void addFile(const DeployableFile &file); void addFile(const Utils::FilePath &localFilePath, const QString &remoteDirectory, DeployableFile::Type type = DeployableFile::TypeNormal); - QString addFilesFromDeploymentFile(const QString &deploymentFilePath, const QString &sourceDir); + QString addFilesFromDeploymentFile(const Utils::FilePath &deploymentFilePath, const Utils::FilePath &sourceDir); int fileCount() const { return m_files.count(); } DeployableFile fileAt(int index) const { return m_files.at(index); }