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

Utils: Remove a few QFileInfo uses from FilePath::relativePath

Browse Source 
Change-Id: I0896678688cc9f7b1d635890eff0603a89f3b2e3
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
hjk
2022-10-14 15:57:38 +02:00
parent d95977db90
commit 88837631de
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/libs/utils/filepath.cpp
View File

@@ -980,28 +980,26 @@ FilePath FilePath::relativeChildPath(const FilePath &parent) const
///
FilePath FilePath::relativePath(const FilePath &anchor) const
{
QTC_ASSERT(!needsDevice(), return *this);
QTC_ASSERT(isSameDevice(anchor), return *this);
const QFileInfo fileInfo(toString());
QString absolutePath;
FilePath absPath;
QString filename;
if (fileInfo.isFile()) {
absolutePath = fileInfo.absolutePath();
filename = fileInfo.fileName();
} else if (fileInfo.isDir()) {
absolutePath = fileInfo.absoluteFilePath();
if (isFile()) {
absPath = absolutePath();
filename = fileName();
} else if (isDir()) {
absPath = absoluteFilePath();
} else {
return {};
}
const QFileInfo anchorInfo(anchor.toString());
QString absoluteAnchorPath;
if (anchorInfo.isFile())
absoluteAnchorPath = anchorInfo.absolutePath();
else if (anchorInfo.isDir())
absoluteAnchorPath = anchorInfo.absoluteFilePath();
FilePath absoluteAnchorPath;
if (anchor.isFile())
absoluteAnchorPath = anchor.absolutePath();
else if (anchor.isDir())
absoluteAnchorPath = anchor.absoluteFilePath();
else
return {};
QString relativeFilePath = calcRelativePath(absolutePath, absoluteAnchorPath);
QString relativeFilePath = calcRelativePath(absPath.path(), absoluteAnchorPath.path());
if (!filename.isEmpty()) {
if (relativeFilePath == ".")
relativeFilePath.clear();