From d7f59870e50bd90824af524175bb1ed16499530b Mon Sep 17 00:00:00 2001 From: stefonarch Date: Wed, 29 Apr 2026 16:22:43 +0200 Subject: [PATCH 1/2] Replaced deprecated invalideFilter --- src/placesview.cpp | 9 ++++++--- src/proxyfoldermodel.cpp | 12 ++++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/placesview.cpp b/src/placesview.cpp index cc220e7b..e80eb76b 100644 --- a/src/placesview.cpp +++ b/src/placesview.cpp @@ -59,7 +59,8 @@ void PlacesProxyModel::restoreHiddenItems(const QSet& items) { ++i; } hiddenItemsRestored_ = true; - invalidateFilter(); + beginFilterChange(); + endFilterChange(); } } @@ -72,12 +73,14 @@ void PlacesProxyModel::setHidden(const QString& str, bool hide) { else { hidden_.remove(str); } - invalidateFilter(); + beginFilterChange(); + endFilterChange(); } void PlacesProxyModel::showAll(bool show) { showAll_ = show; - invalidateFilter(); + beginFilterChange(); + endFilterChange(); } bool PlacesProxyModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const { diff --git a/src/proxyfoldermodel.cpp b/src/proxyfoldermodel.cpp index 3bfe87b5..354170c9 100644 --- a/src/proxyfoldermodel.cpp +++ b/src/proxyfoldermodel.cpp @@ -88,7 +88,8 @@ void ProxyFolderModel::sort(int column, Qt::SortOrder order) { void ProxyFolderModel::setShowHidden(bool show) { if(show != showHidden_) { showHidden_ = show; - invalidateFilter(); + beginFilterChange(); + endFilterChange(); Q_EMIT sortFilterChanged(); } } @@ -96,7 +97,8 @@ void ProxyFolderModel::setShowHidden(bool show) { void ProxyFolderModel::setBackupAsHidden(bool backupAsHidden) { if(backupAsHidden != backupAsHidden_) { backupAsHidden_ = backupAsHidden; - invalidateFilter(); + beginFilterChange(); + endFilterChange(); Q_EMIT sortFilterChanged(); } } @@ -342,13 +344,15 @@ void ProxyFolderModel::onThumbnailLoaded(const QModelIndex& srcIndex, int size) void ProxyFolderModel::addFilter(ProxyFolderModelFilter* filter) { filters_.append(filter); - invalidateFilter(); + beginFilterChange(); + endFilterChange(); Q_EMIT sortFilterChanged(); } void ProxyFolderModel::removeFilter(ProxyFolderModelFilter* filter) { filters_.removeOne(filter); - invalidateFilter(); + beginFilterChange(); + endFilterChange(); Q_EMIT sortFilterChanged(); } From 6796f355399633cf167675fe5ff29c4b80885035 Mon Sep 17 00:00:00 2001 From: stefonarch Date: Wed, 29 Apr 2026 19:55:04 +0200 Subject: [PATCH 2/2] Fix string placement. --- src/placesview.cpp | 6 +++--- src/proxyfoldermodel.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/placesview.cpp b/src/placesview.cpp index e80eb76b..d1380926 100644 --- a/src/placesview.cpp +++ b/src/placesview.cpp @@ -50,6 +50,7 @@ PlacesProxyModel::~PlacesProxyModel() { void PlacesProxyModel::restoreHiddenItems(const QSet& items) { // hidden items should be restored only once if(!hiddenItemsRestored_ && !items.isEmpty()) { + beginFilterChange(); hidden_.clear(); QSet::const_iterator i = items.constBegin(); while (i != items.constEnd()) { @@ -59,12 +60,12 @@ void PlacesProxyModel::restoreHiddenItems(const QSet& items) { ++i; } hiddenItemsRestored_ = true; - beginFilterChange(); endFilterChange(); } } void PlacesProxyModel::setHidden(const QString& str, bool hide) { + beginFilterChange(); if(hide) { if(!str.isEmpty()) { hidden_ << str; @@ -73,13 +74,12 @@ void PlacesProxyModel::setHidden(const QString& str, bool hide) { else { hidden_.remove(str); } - beginFilterChange(); endFilterChange(); } void PlacesProxyModel::showAll(bool show) { - showAll_ = show; beginFilterChange(); + showAll_ = show; endFilterChange(); } diff --git a/src/proxyfoldermodel.cpp b/src/proxyfoldermodel.cpp index 354170c9..3cd2b141 100644 --- a/src/proxyfoldermodel.cpp +++ b/src/proxyfoldermodel.cpp @@ -87,8 +87,8 @@ void ProxyFolderModel::sort(int column, Qt::SortOrder order) { void ProxyFolderModel::setShowHidden(bool show) { if(show != showHidden_) { - showHidden_ = show; beginFilterChange(); + showHidden_ = show; endFilterChange(); Q_EMIT sortFilterChanged(); } @@ -96,8 +96,8 @@ void ProxyFolderModel::setShowHidden(bool show) { void ProxyFolderModel::setBackupAsHidden(bool backupAsHidden) { if(backupAsHidden != backupAsHidden_) { - backupAsHidden_ = backupAsHidden; beginFilterChange(); + backupAsHidden_ = backupAsHidden; endFilterChange(); Q_EMIT sortFilterChanged(); } @@ -343,15 +343,15 @@ void ProxyFolderModel::onThumbnailLoaded(const QModelIndex& srcIndex, int size) } void ProxyFolderModel::addFilter(ProxyFolderModelFilter* filter) { - filters_.append(filter); beginFilterChange(); + filters_.append(filter); endFilterChange(); Q_EMIT sortFilterChanged(); } void ProxyFolderModel::removeFilter(ProxyFolderModelFilter* filter) { - filters_.removeOne(filter); beginFilterChange(); + filters_.removeOne(filter); endFilterChange(); Q_EMIT sortFilterChanged(); }