diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2018-05-24 11:17:04 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2018-05-24 10:09:26 +0000 |
| commit | b5a4e88485a130c00b465f24e228f712684eb98a (patch) | |
| tree | ea18f986c5b0d9ccc7527f8e251b642432b6b89d /src/libs/utils/fileinprojectfinder.cpp | |
| parent | 3fa66ca6e0f240f05a77d177dbf7cb7a6f7609db (diff) | |
FileInProjectFinder: Use FileNameList for file names
This simplifies code and reduces the number of conversions between
QString and Utils::FileName.
Change-Id: I47bd86b9ae09b1da37b4e5e604761367ac1ab26b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/libs/utils/fileinprojectfinder.cpp')
| -rw-r--r-- | src/libs/utils/fileinprojectfinder.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libs/utils/fileinprojectfinder.cpp b/src/libs/utils/fileinprojectfinder.cpp index e1c3c0ec276..d86e8ca9522 100644 --- a/src/libs/utils/fileinprojectfinder.cpp +++ b/src/libs/utils/fileinprojectfinder.cpp @@ -95,7 +95,7 @@ QString FileInProjectFinder::projectDirectory() const return m_projectDir; } -void FileInProjectFinder::setProjectFiles(const QStringList &projectFiles) +void FileInProjectFinder::setProjectFiles(const Utils::FileNameList &projectFiles) { if (m_projectFiles == projectFiles) return; @@ -309,9 +309,9 @@ QString FileInProjectFinder::findInSearchPath(const QString &searchPath, const Q QStringList FileInProjectFinder::filesWithSameFileName(const QString &fileName) const { QStringList result; - foreach (const QString &f, m_projectFiles) { - if (FileName::fromString(f).fileName() == fileName) - result << f; + foreach (const FileName &f, m_projectFiles) { + if (f.fileName() == fileName) + result << f.toString(); } return result; } @@ -319,8 +319,8 @@ QStringList FileInProjectFinder::filesWithSameFileName(const QString &fileName) QStringList FileInProjectFinder::pathSegmentsWithSameName(const QString &pathSegment) const { QStringList result; - for (const QString &f : m_projectFiles) { - QDir dir = FileName::fromString(f).toFileInfo().absoluteDir(); + for (const FileName &f : m_projectFiles) { + QDir dir = f.toFileInfo().absoluteDir(); do { if (dir.dirName() == pathSegment) { if (result.isEmpty() || result.last() != dir.path()) |