Created attachment 112735 [details] Unify group handling When starting to integrate grouping with drag&drop and right sidebar, I needed better access to grouping information and thus restructured it. To remove duplication between icon and table view, I introduced the GroupingViewImplementation class, and I made function names consistent between them. All in all I believe the new code is more readable and shorter. This does not introduce any functional changes. It compiles and I tested some usual grouping functions (group, ungroup, tag, ...) and they still work as expected. https://phabricator.kde.org/D12856
From my side, there seems to be no problems. There is only one compile warning: /home/maik/Devel/digikam/core/app/items/imagecategorizedview.cpp: In member function ‘QList<QUrl> Digikam::ImageCategorizedView::allUrls(bool) const’: /home/maik/Devel/digikam/core/app/items/imagecategorizedview.cpp:316:48: warning: unused parameter ‘grouping’ [-Wunused-parameter] QList<QUrl> ImageCategorizedView::allUrls(bool grouping) const Maik
I checked also this patch this morning, and all sound fine for me. After applying changes in git/master, i will run code checkers to see if all is fine. Gilles
Git commit 6681aba89a229d95aa1037af5f62b8fd3c2ddf03 by Simon Frei. Committed on 21/05/2018 at 19:50. Pushed by sfrei into branch 'master'. Unify group handling FIXED-IN: 6.0.0 Summary: Refactor handling of grouped items in view Differential Revision: https://phabricator.kde.org/D12856 M +2 -1 NEWS M +1 -0 core/app/CMakeLists.txt M +65 -3 core/app/items/digikamimageview.cpp M +16 -1 core/app/items/digikamimageview.h M +9 -121 core/app/items/imagecategorizedview.cpp M +6 -25 core/app/items/imagecategorizedview.h A +94 -0 core/app/utils/groupingviewimplementation.cpp [License: GPL (v2+)] A +55 -0 core/app/utils/groupingviewimplementation.h [License: GPL (v2+)] M +29 -28 core/app/views/digikamview.cpp M +5 -10 core/app/views/digikamview.h M +25 -109 core/app/views/tableview/tableview.cpp M +5 -15 core/app/views/tableview/tableview.h M +8 -0 core/app/views/tableview/tableview_treeview.cpp M +4 -1 core/app/views/tableview/tableview_treeview.h M +1 -1 core/libs/database/utils/dbinfoiface.cpp https://commits.kde.org/digikam/6681aba89a229d95aa1037af5f62b8fd3c2ddf03