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

More warning fixes.

Browse source
This commit is contained in:
cc9cii 2015-04-19 09:42:44 +10:00
parent dd1e4e8b69
commit 8b1ac451ac
5 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/opencs/model/world/nestedcoladapterimp.cpp
View file

@ -94,7 +94,7 @@ namespace CSMWorld
record.setModified (pathgrid);
}
NestedTableWrapperBase* PathgridPointListAdapter::nestedTable(const Record<Pathgrid>& record) const
NestedTableWrapperBase* PathgridPointListAdapter::table(const Record<Pathgrid>& record) const
{
// deleted by dtor of NestedTableStoring
return new PathgridPointsWrap(record.get());
@ -192,7 +192,7 @@ namespace CSMWorld
record.setModified (pathgrid);
}
NestedTableWrapperBase* PathgridEdgeListAdapter::nestedTable(const Record<Pathgrid>& record) const
NestedTableWrapperBase* PathgridEdgeListAdapter::table(const Record<Pathgrid>& record) const
{
// deleted by dtor of NestedTableStoring
return new NestedTableWrapper<ESM::Pathgrid::EdgeList>(record.get().mEdges);
@ -293,7 +293,7 @@ namespace CSMWorld
record.setModified (faction);
}
NestedTableWrapperBase* FactionReactionsAdapter::nestedTable(const Record<ESM::Faction>& record) const
NestedTableWrapperBase* FactionReactionsAdapter::table(const Record<ESM::Faction>& record) const
{
// deleted by dtor of NestedTableStoring
return new NestedTableWrapper<std::map<std::string, int> >(record.get().mReactions);
@ -413,7 +413,7 @@ namespace CSMWorld
record.setModified (region);
}
NestedTableWrapperBase* RegionSoundListAdapter::nestedTable(const Record<ESM::Region>& record) const
NestedTableWrapperBase* RegionSoundListAdapter::table(const Record<ESM::Region>& record) const
{
// deleted by dtor of NestedTableStoring
return new NestedTableWrapper<std::vector<ESM::Region::SoundRef> >(record.get().mSoundList);

12
apps/opencs/model/world/nestedcoladapterimp.hpp
View file

@ -49,7 +49,7 @@ namespace CSMWorld
virtual void setTable(Record<Pathgrid>& record,
const NestedTableWrapperBase& nestedTable) const;
virtual NestedTableWrapperBase* nestedTable(const Record<Pathgrid>& record) const;
virtual NestedTableWrapperBase* table(const Record<Pathgrid>& record) const;
virtual QVariant getData(const Record<Pathgrid>& record,
int subRowIndex, int subColIndex) const;
@ -74,7 +74,7 @@ namespace CSMWorld
virtual void setTable(Record<Pathgrid>& record,
const NestedTableWrapperBase& nestedTable) const;
virtual NestedTableWrapperBase* nestedTable(const Record<Pathgrid>& record) const;
virtual NestedTableWrapperBase* table(const Record<Pathgrid>& record) const;
virtual QVariant getData(const Record<Pathgrid>& record,
int subRowIndex, int subColIndex) const;
@ -99,7 +99,7 @@ namespace CSMWorld
virtual void setTable(Record<ESM::Faction>& record,
const NestedTableWrapperBase& nestedTable) const;
virtual NestedTableWrapperBase* nestedTable(const Record<ESM::Faction>& record) const;
virtual NestedTableWrapperBase* table(const Record<ESM::Faction>& record) const;
virtual QVariant getData(const Record<ESM::Faction>& record,
int subRowIndex, int subColIndex) const;
@ -124,7 +124,7 @@ namespace CSMWorld
virtual void setTable(Record<ESM::Region>& record,
const NestedTableWrapperBase& nestedTable) const;
virtual NestedTableWrapperBase* nestedTable(const Record<ESM::Region>& record) const;
virtual NestedTableWrapperBase* table(const Record<ESM::Region>& record) const;
virtual QVariant getData(const Record<ESM::Region>& record,
int subRowIndex, int subColIndex) const;
@ -181,7 +181,7 @@ namespace CSMWorld
record.setModified (raceOrBthSgn);
}
virtual NestedTableWrapperBase* nestedTable(const Record<ESXRecordT>& record) const
virtual NestedTableWrapperBase* table(const Record<ESXRecordT>& record) const
{
// deleted by dtor of NestedTableStoring
return new NestedTableWrapper<std::vector<std::string> >(record.get().mPowers.mList);
@ -289,7 +289,7 @@ namespace CSMWorld
record.setModified (magic);
}
virtual NestedTableWrapperBase* nestedTable(const Record<ESXRecordT>& record) const
virtual NestedTableWrapperBase* table(const Record<ESXRecordT>& record) const
{
// deleted by dtor of NestedTableStoring
return new NestedTableWrapper<std::vector<ESM::ENAMstruct> >(record.get().mEffects.mList);

2
apps/opencs/model/world/nestedcolumnadapter.hpp
View file

@ -25,7 +25,7 @@ namespace CSMWorld
virtual void setTable(Record<ESXRecordT>& record, const NestedTableWrapperBase& nestedTable) const = 0;
virtual NestedTableWrapperBase* nestedTable(const Record<ESXRecordT>& record) const = 0;
virtual NestedTableWrapperBase* table(const Record<ESXRecordT>& record) const = 0;
virtual QVariant getData(const Record<ESXRecordT>& record, int subRowIndex, int subColIndex) const = 0;

2
apps/opencs/model/world/nestedidcollection.hpp
View file

@ -134,7 +134,7 @@ namespace CSMWorld
CSMWorld::NestedTableWrapperBase* NestedIdCollection<ESXRecordT, IdAccessorT>::nestedTable(int row,
int column) const
{
return getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column)).nestedTable(
return getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column)).table(
Collection<ESXRecordT, IdAccessorT>::getRecord(row));
}

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

@ -861,7 +861,6 @@ namespace CSMWorld
virtual ~EffectsRefIdAdapter() {}
using NestedRefIdAdapterBase::addNestedRow;
virtual void addNestedRow (const RefIdColumn *column,
RefIdData& data, int index, int position) const
{
@ -870,7 +869,6 @@ namespace CSMWorld
EffectsListAdapter<ESXRecordT>::addRow(record, position);
}
using NestedRefIdAdapterBase::removeNestedRow;
virtual void removeNestedRow (const RefIdColumn *column,
RefIdData& data, int index, int rowToRemove) const
{
@ -879,7 +877,6 @@ namespace CSMWorld
EffectsListAdapter<ESXRecordT>::removeRow(record, rowToRemove);
}
using NestedRefIdAdapterBase::setNestedTable;
virtual void setNestedTable (const RefIdColumn* column,
RefIdData& data, int index, const NestedTableWrapperBase& nestedTable) const
{
@ -888,16 +885,14 @@ namespace CSMWorld
EffectsListAdapter<ESXRecordT>::setTable(record, nestedTable);
}
using NestedRefIdAdapterBase::nestedTable;
virtual NestedTableWrapperBase* nestedTable (const RefIdColumn* column,
const RefIdData& data, int index) const
{
const Record<ESXRecordT>& record =
static_cast<const Record<ESXRecordT>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
return EffectsListAdapter<ESXRecordT>::nestedTable(record);
return EffectsListAdapter<ESXRecordT>::table(record);
}
using NestedRefIdAdapterBase::getNestedData;
virtual QVariant getNestedData (const RefIdColumn *column,
const RefIdData& data, int index, int subRowIndex, int subColIndex) const
{
@ -906,7 +901,6 @@ namespace CSMWorld
return EffectsListAdapter<ESXRecordT>::getData(record, subRowIndex, subColIndex);
}
using NestedRefIdAdapterBase::setNestedData;
virtual void setNestedData (const RefIdColumn *column,
RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const
{
@ -915,14 +909,12 @@ namespace CSMWorld
EffectsListAdapter<ESXRecordT>::setData(record, value, subRowIndex, subColIndex);
}
using NestedRefIdAdapterBase::getNestedColumnsCount;
virtual int getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const
{
const Record<ESXRecordT> record; // not used, just a dummy
return EffectsListAdapter<ESXRecordT>::getColumnsCount(record);
}
using NestedRefIdAdapterBase::getNestedRowsCount;
virtual int getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const
{
const Record<ESXRecordT>& record =