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

FileInProjectFinder: Use FileNameList for file names

Browse Source 
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>
This commit is contained in:
Tim Jenssen
2018-05-24 11:17:04 +02:00
parent 3fa66ca6e0
commit b5a4e88485
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/utils/fileinprojectfinder.cpp
View File

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