teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

moved responsibility for getNestedData to the inventory helper

Browse source
This commit is contained in:
Marek Kochanowicz 2014-07-21 14:24:54 +02:00
parent c4598d6200
commit 6573e3f319
2 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
apps/opencs/model/world/nestedadaptors.hpp
View file

@ -10,6 +10,8 @@
#include "refiddata.hpp" #include "refiddata.hpp"
#include "refidadapter.hpp" #include "refidadapter.hpp"
#include <QVariant>
namespace CSMWorld namespace CSMWorld
{ {
template <typename ESXRecordT> template <typename ESXRecordT>
@ -37,6 +39,27 @@ namespace CSMWorld
return new NestedTableWrapper<std::vector<ESM::ContItem> >(getRecord(data, index).get().mInventory.mList); return new NestedTableWrapper<std::vector<ESM::ContItem> >(getRecord(data, index).get().mInventory.mList);
} }
QVariant getNestedData(const CSMWorld::RefIdColumn* column,
const CSMWorld::RefIdData& data,
int index,
int subRowIndex,
int subColIndex) const
{
const ESM::ContItem& content = getRecord(data, index).get().mInventory.mList.at(subRowIndex);
switch (subColIndex)
{
case 0:
return QString::fromUtf8(content.mItem.toString().c_str());
case 1:
return content.mCount;
default:
throw std::logic_error("Trying to access non-existing column in the nested table!");
}
}
private: private:
const Record<ESXRecordT>& getRecord(const RefIdData& data, int index) const const Record<ESXRecordT>& getRecord(const RefIdData& data, int index) const

17
apps/opencs/model/world/refidadapterimp.cpp
View file

@ -329,24 +329,9 @@ QVariant CSMWorld::ContainerRefIdAdapter::getNestedData (const CSMWorld::RefIdCo
int subRowIndex, int subRowIndex,
int subColIndex) const int subColIndex) const
{ {
const Record<ESM::Container>& record = static_cast<const Record<ESM::Container>&> (
data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Container)));
if (column==mContent) if (column==mContent)
{ {
const ESM::ContItem& content = record.get().mInventory.mList.at(subRowIndex); return mHelper.getNestedData(column, data, index, subRowIndex, subColIndex);
switch (subColIndex)
{
case 0:
return QString::fromUtf8(content.mItem.toString().c_str());
case 1:
return content.mCount;
default:
throw std::logic_error("Trying to access non-existing column in the nested table!");
}
} else } else
{ {
throw std::logic_error("This column does not hold multiple values."); throw std::logic_error("This column does not hold multiple values.");