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

Utils: Make FileName::canonicalPath a member

Browse Source 
Change-Id: I8d7450dec5c4c14ae3e007d1d66f1a9c3c98f807
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2019-05-17 13:44:09 +02:00
parent 22cd81ffbc
commit 36daca80f3
5 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,17 +234,17 @@ FileName FileUtils::resolveSymlinks(const FileName &path)
}
/*!
Recursively resolves possibly present symlinks in \a filePath.
Recursively resolves possibly present symlinks in this file name.
Unlike QFileInfo::canonicalFilePath(), this function will not return an empty
string if path doesn't exist.
Returns the canonical path.
*/
FileName FileUtils::canonicalPath(const FileName &path)
FileName FileName::canonicalPath() const
{
const QString result = path.toFileInfo().canonicalFilePath();
const QString result = toFileInfo().canonicalFilePath();
if (result.isEmpty())
return path;
return *this;
return FileName::fromString(result);
}
@@ -356,7 +356,7 @@ FileName FileUtils::commonPath(const FileName &oldCommonPath, const FileName &fi
FileName newCommonPath = oldCommonPath;
while (!newCommonPath.isEmpty() && !fileName.isChildOf(newCommonPath))
newCommonPath = newCommonPath.parentDir();
return canonicalPath(newCommonPath);
return newCommonPath.canonicalPath();
}
// Copied from qfilesystemengine_win.cpp