X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/eafe63b5f4056322dec48ce540ab24510d755a22..a2c9c05de2dfabbb2bb614390c8e03023dad2bd1:/src/kitemviews/kfileitemmodel.cpp?ds=sidebyside diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index 4af851733..c08f8e964 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -238,7 +238,11 @@ bool KFileItemModel::sortHiddenLast() const void KFileItemModel::setShowHiddenFiles(bool show) { +#if KIO_VERSION < QT_VERSION_CHECK(5, 100, 0) m_dirLister->setShowingDotFiles(show); +#else + m_dirLister->setShowHiddenFiles(show); +#endif m_dirLister->emitChanges(); if (show) { dispatchPendingItemsToInsert(); @@ -247,7 +251,11 @@ void KFileItemModel::setShowHiddenFiles(bool show) bool KFileItemModel::showHiddenFiles() const { +#if KIO_VERSION < QT_VERSION_CHECK(5, 100, 0) return m_dirLister->showingDotFiles(); +#else + return m_dirLister->showHiddenFiles(); +#endif } void KFileItemModel::setShowDirectoriesOnly(bool enabled) @@ -1142,7 +1150,14 @@ void KFileItemModel::slotItemsDeleted(const KFileItemList& items) indexesToRemove.reserve(items.count()); KFileItemList dirsChanged; + const auto currentDir = directory(); + for (const KFileItem& item : items) { + if (item.url() == currentDir) { + Q_EMIT currentDirectoryRemoved(); + return; + } + const int indexForItem = index(item); if (indexForItem >= 0) { indexesToRemove.append(indexForItem);