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

Utils: Remove QDir use from parentDir() implementation

Browse Source 
cleanPath() is good enough now.

Change-Id: I3f0e7a96496c11bc90c4eb83c35d706aeab93aa6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2022-09-23 10:28:59 +02:00
parent 7b77085652
commit d5412588fd
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -711,14 +711,10 @@ FilePath FilePath::parentDir() const
if (basePath.isEmpty()) if (basePath.isEmpty())
return FilePath(); return FilePath();
// TODO: Replace usage of QDir !!
const QDir base(basePath);
if (base.isRoot())
return FilePath();
const QString path = basePath + QLatin1String("/.."); const QString path = basePath + QLatin1String("/..");
const QString parent = doCleanPath(path); const QString parent = doCleanPath(path);
QTC_ASSERT(parent != path, return FilePath()); if (parent == path)
return FilePath();
return withNewPath(parent); return withNewPath(parent);
} }