aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/utils/terminalhooks.cpp
diff options
context:
space:
mode:
authorhjk <[email protected]>2025-04-11 11:51:03 +0200
committerhjk <[email protected]>2025-04-11 14:51:57 +0000
commiteeaa93fc749d36abb7b2f175ba25d36cbd95d1c6 (patch)
tree2fe3132c1431f3a365191e844db9031d950d3880 /src/libs/utils/terminalhooks.cpp
parenta460ec1641f6fb39901bb38d930a209a9078efaf (diff)
Replace most expected_str by Utils::Result
Keep it in Axivion dto, which is generated. Change-Id: I83a12de6234ac7b0218b369875bdc72d25dbadfb Reviewed-by: Eike Ziller <[email protected]> Reviewed-by: Jarek Kobus <[email protected]>
Diffstat (limited to 'src/libs/utils/terminalhooks.cpp')
-rw-r--r--src/libs/utils/terminalhooks.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/utils/terminalhooks.cpp b/src/libs/utils/terminalhooks.cpp
index 0084121bce9..ae6a45bfa95 100644
--- a/src/libs/utils/terminalhooks.cpp
+++ b/src/libs/utils/terminalhooks.cpp
@@ -12,12 +12,12 @@
namespace Utils::Terminal {
-expected_str<FilePath> defaultShellForDevice(const FilePath &deviceRoot)
+Result<FilePath> defaultShellForDevice(const FilePath &deviceRoot)
{
if (deviceRoot.osType() == OsTypeWindows)
return deviceRoot.withNewPath("cmd.exe").searchInPath();
- const expected_str<Environment> env = deviceRoot.deviceEnvironmentWithError();
+ const Result<Environment> env = deviceRoot.deviceEnvironmentWithError();
if (!env)
return make_unexpected(env.error());