mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-29 03:26:38 +00:00
Code Issues Releases Wiki Activity

Merge branch 'NonTableFields' of https://github.com/sirherrbatka/openmw

Browse source 
into NonTableFields

I have no idea what I'm doing

Conflicts:
	apps/opencs/model/world/idtable.cpp
	apps/opencs/model/world/refidadapter.hpp
	apps/opencs/model/world/refidadapterimp.hpp
This commit is contained in:
Marek Kochanowicz 2014-06-17 14:21:50 +02:00
commit 03980034a5
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/model/world/idtable.cpp
View file

@ -42,7 +42,7 @@ QVariant CSMWorld::IdTable::data (const QModelIndex & index, int role) const
if (role==Qt::EditRole && !mIdCollection->getColumn (index.column()).isEditable()) if (role==Qt::EditRole && !mIdCollection->getColumn (index.column()).isEditable())
return QVariant(); return QVariant();
if (index.internalId() != 0) if (index.hasChildren())
{ {
std::pair<int, int> parentAdress(unfoldIndexAdress(index.internalId())); std::pair<int, int> parentAdress(unfoldIndexAdress(index.internalId()));
return mIdCollection->getNestedData(parentAdress.first, parentAdress.second, index.row(), index.column()); return mIdCollection->getNestedData(parentAdress.first, parentAdress.second, index.row(), index.column());

4
apps/opencs/model/world/refidadapterimp.hpp
View file

@ -624,7 +624,11 @@ namespace CSMWorld
virtual QVariant getData (const RefIdColumn *column, const RefIdData& data, int index) const; virtual QVariant getData (const RefIdColumn *column, const RefIdData& data, int index) const;
virtual void setNestedData (const RefIdColumn *column, RefIdData& data, int index, virtual void setNestedData (const RefIdColumn *column, RefIdData& data, int index,
<<<<<<< HEAD
const QVariant& value, int subRowIndex, int subColIndex) const; const QVariant& value, int subRowIndex, int subColIndex) const;
=======
const QVariant& value, int subRowIndex, int subColIndex) const;
>>>>>>> 187fccc8cc630f1f469b4f5fc4e23a28ad8253ec
virtual void setData (const RefIdColumn *column, RefIdData& data, int index, virtual void setData (const RefIdColumn *column, RefIdData& data, int index,
const QVariant& value) const; const QVariant& value) const;