From fee63891ac8a372b0c3c8194777fbe58ed5c4f8a Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Tue, 27 Dec 2022 20:59:09 +0100
Subject: [PATCH] FilesystemMusicStorage: `QFile::moveToTrash` recursively
 moves files to trash

---
 src/core/filesystemmusicstorage.cpp |  7 +------
 src/core/utilities.cpp              | 26 --------------------------
 src/core/utilities.h                |  1 -
 3 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/src/core/filesystemmusicstorage.cpp b/src/core/filesystemmusicstorage.cpp
index 69ae26638..b77d82e55 100644
--- a/src/core/filesystemmusicstorage.cpp
+++ b/src/core/filesystemmusicstorage.cpp
@@ -106,12 +106,7 @@ bool FilesystemMusicStorage::DeleteFromStorage(const DeleteJob &job) {
 
   if (job.use_trash_) {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
-    if (fileInfo.isDir()) {
-      return Utilities::MoveToTrashRecursive(path);
-    }
-    else {
-      return QFile::moveToTrash(path);
-    }
+    return QFile::moveToTrash(path);
 #else
     return false;
 #endif
diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp
index 45f2ba5f4..e5149f5a3 100644
--- a/src/core/utilities.cpp
+++ b/src/core/utilities.cpp
@@ -239,32 +239,6 @@ quint64 FileSystemFreeSpace(const QString &path) {
 
 }
 
-bool MoveToTrashRecursive(const QString &path) {
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
-  QDir dir(path);
-  for (const QString &child : dir.entryList(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Hidden)) {
-    if (!MoveToTrashRecursive(path + "/" + child)) {
-      return false;
-    }
-  }
-
-  for (const QString &child : dir.entryList(QDir::NoDotAndDotDot | QDir::Files | QDir::Hidden)) {
-    if (!QFile::moveToTrash(path + "/" + child)) {
-      return false;
-    }
-  }
-
-  return dir.rmdir(path);
-
-#else
-  Q_UNUSED(path)
-  return false;
-
-#endif
-
-}
-
 bool RemoveRecursive(const QString &path) {
 
   QDir dir(path);
diff --git a/src/core/utilities.h b/src/core/utilities.h
index 5e5caf1a1..859ab1799 100644
--- a/src/core/utilities.h
+++ b/src/core/utilities.h
@@ -65,7 +65,6 @@ QString ColorToRgba(const QColor &color);
 quint64 FileSystemCapacity(const QString &path);
 quint64 FileSystemFreeSpace(const QString &path);
 
-bool MoveToTrashRecursive(const QString &path);
 bool RemoveRecursive(const QString &path);
 bool CopyRecursive(const QString &source, const QString &destination);
 bool Copy(QIODevice *source, QIODevice *destination);