[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam/frameworks] libs: Disable dynamicSortFilter on album models
From:       Marcel Wiesweg <marcel.wiesweg () gmx ! de>
Date:       2015-09-20 15:55:04
Message-ID: E1ZdgxE-0004Wq-Ow () scm ! kde ! org
[Download RAW message or body]

Git commit 3a73daafd966d172ff930cc6f0c797020b98360b by Marcel Wiesweg.
Committed on 20/09/2015 at 15:47.
Pushed by mwiesweg into branch 'frameworks'.

Disable dynamicSortFilter on album models

Use internal change detection instead, which should be more efficient.
Regressions are possible - none found yet.

M  +1    -1    libs/album/albumselectcombobox.cpp
M  +1    -1    libs/album/albumtreeview.cpp
M  +2    -2    libs/models/albumfiltermodel.cpp

http://commits.kde.org/digikam/3a73daafd966d172ff930cc6f0c797020b98360b

diff --git a/libs/album/albumselectcombobox.cpp b/libs/album/albumselectcombobox.cpp
index 52305b4..92ad480 100644
--- a/libs/album/albumselectcombobox.cpp
+++ b/libs/album/albumselectcombobox.cpp
@@ -106,7 +106,7 @@ void AlbumSelectComboBox::setModel(AbstractCheckableAlbumModel* model, AlbumFilt
     else
     {
         d->filterModel = new AlbumFilterModel(this);
-        d->filterModel->setDynamicSortFilter(true);
+        //d->filterModel->setDynamicSortFilter(true);
         d->filterModel->setSourceAlbumModel(d->model);
     }
 
diff --git a/libs/album/albumtreeview.cpp b/libs/album/albumtreeview.cpp
index 8e5c3b5..2820168 100644
--- a/libs/album/albumtreeview.cpp
+++ b/libs/album/albumtreeview.cpp
@@ -341,7 +341,7 @@ void AbstractAlbumTreeView::setAlbumFilterModel(AlbumFilterModel* const filterMo
             expand(m_albumFilterModel->rootAlbumIndex());
         }
 
-        m_albumFilterModel->setDynamicSortFilter(true);
+        //m_albumFilterModel->setDynamicSortFilter(true);
     }
 }
 
diff --git a/libs/models/albumfiltermodel.cpp b/libs/models/albumfiltermodel.cpp
index 779e1c4..3797db9 100644
--- a/libs/models/albumfiltermodel.cpp
+++ b/libs/models/albumfiltermodel.cpp
@@ -427,9 +427,9 @@ void AlbumFilterModel::slotAlbumRenamed(Album* album)
 
 void AlbumFilterModel::slotAlbumsHaveBeenUpdated(int type)
 {
-    if (isFiltering() && sourceAlbumModel() && sourceAlbumModel()->albumType() == type)
+    if (sourceAlbumModel() && sourceAlbumModel()->albumType() == type)
     {
-        invalidateFilter();
+        invalidate();
     }
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]