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

Utils: Change semantics of FilePath::onDeviceSearchInPath()

Browse Source 
... 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 <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-07-08 06:53:28 +02:00
parent eff5cbeb86
commit 05545adb93
8 changed files with 31 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/utils/fileutils.cpp
View File

@@ -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