office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-07-04 16:48:48 +00:00
Code Issues Projects Releases Wiki Activity

Simplify PageGroupProxyModel, no need for mixIndex

Browse Source 
The parentIndex was always invalid so this would always store
4294967295 as internal ID (and never use it).
This commit is contained in:
David Faure 2024-05-18 13:28:01 +02:00 committed by Sune Vuorela
parent bcbfa0c7ac
commit 784c1db9df
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
part/annotationproxymodels.cpp
View File

@ -14,11 +14,6 @@
#include "annotationmodel.h"
#include "gui/debug_ui.h"
static quint32 mixIndex(int row, int column)
{
return (row << 4) | column;
}
PageFilterProxyModel::PageFilterProxyModel(QObject *parent)
: QSortFilterProxyModel(parent)
, mGroupByCurrentPage(false)
@ -137,8 +132,9 @@ QModelIndex PageGroupProxyModel::index(int row, int column, const QModelIndex &p
}
}
} else {
if (row < mIndexes.count()) {
return createIndex(row, column, mixIndex(parentIndex.row(), parentIndex.column()));
// We have only top-level items
if (!parentIndex.isValid() && row < mIndexes.count()) {
return createIndex(row, column);
} else {
return QModelIndex();
}
@ -254,6 +250,7 @@ void PageGroupProxyModel::doRebuildIndexes()
} else {
mIndexes.clear();
// Flatten the source model
for (int row = 0; row < sourceModel()->rowCount(); ++row) {
const QModelIndex pageIndex = sourceModel()->index(row, 0);
for (int subRow = 0; subRow < sourceModel()->rowCount(pageIndex); ++subRow) {