diff options
author | hjk <hjk@qt.io> | 2019-12-17 14:07:53 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-12-18 08:43:18 +0000 |
commit | e109b731ad001ba566289b7184799e91b19fbccb (patch) | |
tree | 133667f71377d5af130b776f97d3f090ef1c8138 /src/libs/utils/fileinprojectfinder.cpp | |
parent | e16876df0cd65c40480fcf7f2ae9f16ab66c991c (diff) |
Utils: Rename FilePathList to simply FilePaths
The exact storage type does not really matter here.
Change-Id: Iefec40f0f5909c8e7ba3415db4a11962694e1b38
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/libs/utils/fileinprojectfinder.cpp')
-rw-r--r-- | src/libs/utils/fileinprojectfinder.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/libs/utils/fileinprojectfinder.cpp b/src/libs/utils/fileinprojectfinder.cpp index 3dbde17792e..8f88976e1d1 100644 --- a/src/libs/utils/fileinprojectfinder.cpp +++ b/src/libs/utils/fileinprojectfinder.cpp @@ -100,7 +100,7 @@ FilePath FileInProjectFinder::projectDirectory() const return m_projectDir; } -void FileInProjectFinder::setProjectFiles(const FilePathList &projectFiles) +void FileInProjectFinder::setProjectFiles(const FilePaths &projectFiles) { if (m_projectFiles == projectFiles) return; @@ -142,12 +142,12 @@ void FileInProjectFinder::addMappedPath(const FilePath &localFilePath, const QSt folder specified. Third, we walk the list of project files, and search for a file name match there. If all fails, it returns the original path from the file URL. */ -FilePathList FileInProjectFinder::findFile(const QUrl &fileUrl, bool *success) const +FilePaths FileInProjectFinder::findFile(const QUrl &fileUrl, bool *success) const { qCDebug(finderLog) << "FileInProjectFinder: trying to find file" << fileUrl.toString() << "..."; if (fileUrl.scheme() == "qrc" || fileUrl.toString().startsWith(':')) { - const FilePathList result = m_qrcUrlFinder.find(fileUrl); + const FilePaths result = m_qrcUrlFinder.find(fileUrl); if (!result.isEmpty()) { if (success) *success = true; @@ -159,7 +159,7 @@ FilePathList FileInProjectFinder::findFile(const QUrl &fileUrl, bool *success) c if (originalPath.isEmpty()) // e.g. qrc:// originalPath = fileUrl.path(); - FilePathList result; + FilePaths result; bool found = findFileOrDirectory(originalPath, [&](const QString &fileName, int) { result << FilePath::fromString(fileName); }); @@ -446,12 +446,12 @@ QStringList FileInProjectFinder::bestMatches(const QStringList &filePaths, return bestFilePaths; } -FilePathList FileInProjectFinder::searchDirectories() const +FilePaths FileInProjectFinder::searchDirectories() const { return m_searchDirectories; } -void FileInProjectFinder::setAdditionalSearchDirectories(const FilePathList &searchDirectories) +void FileInProjectFinder::setAdditionalSearchDirectories(const FilePaths &searchDirectories) { m_searchDirectories = searchDirectories; } @@ -461,7 +461,7 @@ FileInProjectFinder::PathMappingNode::~PathMappingNode() qDeleteAll(children); } -FilePathList FileInProjectFinder::QrcUrlFinder::find(const QUrl &fileUrl) const +FilePaths FileInProjectFinder::QrcUrlFinder::find(const QUrl &fileUrl) const { const auto fileIt = m_fileCache.constFind(fileUrl); if (fileIt != m_fileCache.cend()) @@ -476,19 +476,19 @@ FilePathList FileInProjectFinder::QrcUrlFinder::find(const QUrl &fileUrl) const qrcParser->collectFilesAtPath(QrcParser::normalizedQrcFilePath(fileUrl.toString()), &hits); } hits.removeDuplicates(); - const FilePathList result = transform(hits, &FilePath::fromString); + const FilePaths result = transform(hits, &FilePath::fromString); m_fileCache.insert(fileUrl, result); return result; } -void FileInProjectFinder::QrcUrlFinder::setProjectFiles(const FilePathList &projectFiles) +void FileInProjectFinder::QrcUrlFinder::setProjectFiles(const FilePaths &projectFiles) { m_allQrcFiles = filtered(projectFiles, [](const FilePath &f) { return f.endsWith(".qrc"); }); m_fileCache.clear(); m_parserCache.clear(); } -FilePath chooseFileFromList(const FilePathList &candidates) +FilePath chooseFileFromList(const FilePaths &candidates) { if (candidates.length() == 1) return candidates.first(); |