mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-04 16:45:34 +00:00
Code Issues Releases Wiki Activity

Proper index creation for nested data

Browse source
This commit is contained in:
Stanislav Bas 2015-07-25 17:57:40 +03:00
parent fcf9ae42f4
commit c088cd4fa9
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/opencs/model/world/idtree.cpp
View file

@ -171,10 +171,10 @@ QModelIndex CSMWorld::IdTree::index (int row, int column, const QModelIndex& par
encodedId = this->foldIndexAddress(parent); encodedId = this->foldIndexAddress(parent);
} }
if (row<0 || row>=idCollection()->getSize()) if (row < 0 || row >= rowCount(parent))
return QModelIndex(); return QModelIndex();
if (column<0 || column>=idCollection()->getColumns()) if (column < 0 || column >= columnCount(parent))
return QModelIndex(); return QModelIndex();
return createIndex(row, column, encodedId); // store internal id return createIndex(row, column, encodedId); // store internal id

6
apps/opencs/model/world/nestedtableproxymodel.cpp
View file

@ -75,10 +75,10 @@ QModelIndex CSMWorld::NestedTableProxyModel::index(int row, int column, const QM
{ {
assert (!parent.isValid()); assert (!parent.isValid());
int rows = mMainModel->rowCount(parent); int numRows = rowCount(parent);
int columns = mMainModel->columnCount(parent); int numColumns = columnCount(parent);
if (row < 0 || row >= rows || column < 0 || column >= columns) if (row < 0 || row >= numRows || column < 0 || column >= numColumns)
return QModelIndex(); return QModelIndex();
return createIndex(row, column); return createIndex(row, column);