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

Utils: Merge FileUtils::removeRecursively() into FilePath

Browse Source 
This simplify the interface by removing a possibly wrong choice
ensures it works also on remote paths.

Change-Id: I01e198958900a91b99dcf2dbb491a593485493ba
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2021-07-01 08:59:32 +02:00
parent 8ed5836746
commit 92904480f0
7 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/clangtools/virtualfilesystemoverlay.cpp
View File

@@ -47,7 +47,7 @@ VirtualFileSystemOverlay::VirtualFileSystemOverlay(const QString &rootPattern)
void VirtualFileSystemOverlay::update()
{
Utils::FileUtils::removeRecursively(overlayFilePath());
overlayFilePath().removeRecursively();
QFile overlayFile(m_overlayFilePath.toString());
if (!overlayFile.open(QFile::ReadWrite))
return;
@@ -61,8 +61,7 @@ void VirtualFileSystemOverlay::update()
documentRoots[doc->filePath().absolutePath()] << doc;
AutoSavedPath saved = m_saved.take(document);
if (saved.revision != document->document()->revision()) {
if (saved.path.exists())
Utils::FileUtils::removeRecursively(saved.path);
saved.path.removeRecursively();
saved.revision = document->document()->revision();
QString error;
saved.path = Utils::FilePath::fromString(m_root.path())
@@ -79,7 +78,7 @@ void VirtualFileSystemOverlay::update()
for (const AutoSavedPath &path : qAsConst(m_saved)) {
QString error;
if (!Utils::FileUtils::removeRecursively(path.path, &error))
if (!path.path.removeRecursively(&error))
qCDebug(LOG) << error;
}
m_saved = newSaved;