diff --git a/src/misc.cpp b/src/misc.cpp index 34ecd44e4..3093cdd67 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -921,16 +921,6 @@ QString misc::fileName(QString file_path) return file_path.mid(slash_index+1); } -bool misc::removeEmptyFolder(const QString &dirpath) -{ - QDir savedir(dirpath); - const QString dirname = savedir.dirName(); - if(savedir.exists() && savedir.cdUp()) { - return savedir.rmdir(dirname); - } - return false; -} - QString misc::parseHtmlLinks(const QString &raw_text) { QString result = raw_text; diff --git a/src/misc.h b/src/misc.h index 8bb6870c7..e701d5cc4 100644 --- a/src/misc.h +++ b/src/misc.h @@ -95,8 +95,6 @@ public: static QString parseHtmlLinks(const QString &raw_text); - static bool removeEmptyFolder(const QString &dirpath); - static quint64 computePathSize(QString path); static QString truncateRootFolder(boost::intrusive_ptr t); diff --git a/src/qtlibtorrent/qbtsession.cpp b/src/qtlibtorrent/qbtsession.cpp index bbdf42769..2f823c34d 100644 --- a/src/qtlibtorrent/qbtsession.cpp +++ b/src/qtlibtorrent/qbtsession.cpp @@ -796,7 +796,7 @@ void QBtSession::deleteTorrent(const QString &hash, bool delete_local_files) { QFile::remove(uneeded_file); const QString parent_folder = misc::branchPath(uneeded_file); qDebug("Attempt to remove parent folder (if empty): %s", qPrintable(parent_folder)); - misc::removeEmptyFolder(parent_folder); + QDir().rmdir(parent_folder); } } // Remove it from torrent backup directory @@ -2357,7 +2357,7 @@ void QBtSession::readAlerts() { if(savePathsToRemove.contains(hash)) { const QString dirpath = savePathsToRemove.take(hash); qDebug() << "Removing save path: " << dirpath << "..."; - bool ok = misc::removeEmptyFolder(dirpath); + bool ok = QDir().rmdir(dirpath); Q_UNUSED(ok); qDebug() << "Folder was removed: " << ok; } @@ -2366,7 +2366,7 @@ void QBtSession::readAlerts() { qDebug() << "hash is empty, use fallback to remove save path"; foreach(const QString& key, savePathsToRemove.keys()) { // Attempt to delete - if(misc::removeEmptyFolder(savePathsToRemove[key])) { + if(QDir().rmdir(savePathsToRemove[key])) { savePathsToRemove.remove(key); } }