aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/utils/fileutils.cpp
diff options
context:
space:
mode:
authorhjk <[email protected]>2021-07-08 06:53:28 +0200
committerhjk <[email protected]>2021-07-08 10:28:49 +0000
commit05545adb93ebdd04df7670d05e91a704375f78b5 (patch)
treea40f07905dbadf4181faca66969c8d649105bf26 /src/libs/utils/fileutils.cpp
parenteff5cbeb86d36297d86e55d5c94a9bb767d1095b (diff)
Utils: Change semantics of FilePath::onDeviceSearchInPath()
... and rename it to searchOnDevice(). We need to handle additional search directories anyways, so its more uniform to always pass a list all of them. Change-Id: I46c7860b51d11c26db58045ff3ab922148af021f Reviewed-by: Christian Stenger <[email protected]>
Diffstat (limited to 'src/libs/utils/fileutils.cpp')
-rw-r--r--src/libs/utils/fileutils.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp
index c739b74ec31..87ffc501492 100644
--- a/src/libs/utils/fileutils.cpp
+++ b/src/libs/utils/fileutils.cpp
@@ -1374,17 +1374,17 @@ FilePath FilePath::onDevice(const FilePath &deviceTemplate) const
Example usage:
\code
binary = FilePath::fromUrl("docker://123/./make);
- fullPath = binary.onDeviceSearchInPath();
+ fullPath = binary.searchOnDevice();
assert(fullPath == FilePath::fromUrl("docker://123/usr/bin/make"))
\endcode
*/
-FilePath FilePath::onDeviceSearchInPath(const FilePaths &additionalDirs) const
+FilePath FilePath::searchOnDevice(const FilePaths &dirs) const
{
if (needsDevice()) {
QTC_ASSERT(s_deviceHooks.searchInPath, return {});
- return s_deviceHooks.searchInPath(*this, additionalDirs);
+ return s_deviceHooks.searchInPath(*this, dirs);
}
- return Environment::systemEnvironment().searchInPath(path(), additionalDirs);
+ return Environment::systemEnvironment().searchInPath(path(), dirs);
}
Environment FilePath::deviceEnvironment() const