From f952fe30e78148e45c12ba74285c9400daece5fd Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 23 May 2023 14:37:19 +0200
Subject: [PATCH] Conan: CPaster: Use FilePathAspect

Change-Id: I982ae4115af818cc25c46acc84713e7432b18548
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/conan/conaninstallstep.cpp                | 3 +--
 src/plugins/cpaster/fileshareprotocolsettingspage.cpp | 1 -
 src/plugins/cpaster/fileshareprotocolsettingspage.h   | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/plugins/conan/conaninstallstep.cpp b/src/plugins/conan/conaninstallstep.cpp
index fbc5999192d..cae573845e8 100644
--- a/src/plugins/conan/conaninstallstep.cpp
+++ b/src/plugins/conan/conaninstallstep.cpp
@@ -70,13 +70,12 @@ ConanInstallStep::ConanInstallStep(BuildStepList *bsl, Id id)
     setUseEnglishOutput();
     setDisplayName(Tr::tr("Conan install"));
 
-    auto conanFile = addAspect<StringAspect>();
+    auto conanFile = addAspect<FilePathAspect>();
     conanFile->setSettingsKey("ConanPackageManager.InstallStep.ConanFile");
     conanFile->setFilePath(conanFilePath(project(),
                            project()->projectDirectory() / "conanfile.txt"));
     conanFile->setLabelText(Tr::tr("Conan file:"));
     conanFile->setToolTip(Tr::tr("Enter location of conanfile.txt or conanfile.py."));
-    conanFile->setDisplayStyle(StringAspect::PathChooserDisplay);
     conanFile->setExpectedKind(PathChooser::File);
 
     auto additionalArguments = addAspect<StringAspect>();
diff --git a/src/plugins/cpaster/fileshareprotocolsettingspage.cpp b/src/plugins/cpaster/fileshareprotocolsettingspage.cpp
index dd12a68e73d..04b896fa76f 100644
--- a/src/plugins/cpaster/fileshareprotocolsettingspage.cpp
+++ b/src/plugins/cpaster/fileshareprotocolsettingspage.cpp
@@ -22,7 +22,6 @@ FileShareProtocolSettings::FileShareProtocolSettings()
 
     registerAspect(&path);
     path.setSettingsKey("Path");
-    path.setDisplayStyle(StringAspect::PathChooserDisplay);
     path.setExpectedKind(PathChooser::ExistingDirectory);
     path.setDefaultValue(TemporaryDirectory::masterDirectoryPath());
     path.setLabelText(Tr::tr("&Path:"));
diff --git a/src/plugins/cpaster/fileshareprotocolsettingspage.h b/src/plugins/cpaster/fileshareprotocolsettingspage.h
index 36a06c2106b..56c843007de 100644
--- a/src/plugins/cpaster/fileshareprotocolsettingspage.h
+++ b/src/plugins/cpaster/fileshareprotocolsettingspage.h
@@ -12,7 +12,7 @@ class FileShareProtocolSettings : public Core::PagedSettings
 public:
     FileShareProtocolSettings();
 
-    Utils::StringAspect path;
+    Utils::FilePathAspect path;
     Utils::IntegerAspect displayCount;
 };