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

Fix for more gcc differences.

Browse source
This commit is contained in:
cc9cii 2015-04-09 20:53:41 +10:00
parent 3a46512b7f
commit 23db79ebab
8 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,7 @@ namespace CSMWorld
class IdTable; class IdTable;
class IdTree; class IdTree;
struct RecordBase; struct RecordBase;
class NestedTableWrapperBase; struct NestedTableWrapperBase;
class ModifyCommand : public QUndoCommand class ModifyCommand : public QUndoCommand
{ {

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

@ -7,7 +7,7 @@ class QVariant;
namespace CSMWorld namespace CSMWorld
{ {
class NestedTableWrapperBase; struct NestedTableWrapperBase;
template<typename ESXRecordT> template<typename ESXRecordT>
class NestedIdAdapter class NestedIdAdapter

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

@ -20,7 +20,7 @@ namespace CSMWorld
{ {
class NestedCollection; class NestedCollection;
struct RecordBase; struct RecordBase;
class NestedTableWrapperBase; // FIXME: is this necessary? struct NestedTableWrapperBase;
class IdTree : public IdTable class IdTree : public IdTable
{ {

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

@ -6,7 +6,7 @@ class QVariant;
namespace CSMWorld namespace CSMWorld
{ {
class NestableColumn; class NestableColumn;
class NestedTableWrapperBase; struct NestedTableWrapperBase;
class NestedCollection class NestedCollection
{ {

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

@ -20,7 +20,7 @@ namespace CSMWorld
class RefIdColumn; class RefIdColumn;
class RefIdData; class RefIdData;
struct RecordBase; struct RecordBase;
class NestedTableWrapperBase; struct NestedTableWrapperBase;
class HelperBase; class HelperBase;
class RefIdAdapter class RefIdAdapter

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

@ -16,7 +16,7 @@
namespace CSMWorld namespace CSMWorld
{ {
class NestedTableWrapperBase; struct NestedTableWrapperBase;
struct BaseColumns struct BaseColumns
{ {

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

@ -18,7 +18,7 @@ namespace ESM
namespace CSMWorld namespace CSMWorld
{ {
class RefIdAdapter; class RefIdAdapter;
class NestedTableWrapperBase; struct NestedTableWrapperBase;
class RefIdColumn : public NestableColumn class RefIdColumn : public NestableColumn
{ {

24
apps/opencs/model/world/subcellcollection.hpp
View file

@ -102,53 +102,61 @@ namespace CSMWorld
template<typename ESXRecordT, typename IdAccessorT> template<typename ESXRecordT, typename IdAccessorT>
void SubCellCollection<ESXRecordT, IdAccessorT>::addNestedRow(int row, int column, int position) void SubCellCollection<ESXRecordT, IdAccessorT>::addNestedRow(int row, int column, int position)
{ {
getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column))->addNestedRow(getRecord(row), position); getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column))->addNestedRow(
Collection<ESXRecordT, IdAccessorT>::getRecord(row), position);
} }
template<typename ESXRecordT, typename IdAccessorT> template<typename ESXRecordT, typename IdAccessorT>
void SubCellCollection<ESXRecordT, IdAccessorT>::removeNestedRows(int row, int column, int subRow) void SubCellCollection<ESXRecordT, IdAccessorT>::removeNestedRows(int row, int column, int subRow)
{ {
getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column))->removeNestedRow(getRecord(row), subRow); getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column))->removeNestedRow(
Collection<ESXRecordT, IdAccessorT>::getRecord(row), subRow);
} }
template<typename ESXRecordT, typename IdAccessorT> template<typename ESXRecordT, typename IdAccessorT>
QVariant SubCellCollection<ESXRecordT, IdAccessorT>::getNestedData (int row, QVariant SubCellCollection<ESXRecordT, IdAccessorT>::getNestedData (int row,
int column, int subRow, int subColumn) const int column, int subRow, int subColumn) const
{ {
return getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column))->getNestedData(getRecord(row), subRow, subColumn); return getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column))->getNestedData(
Collection<ESXRecordT, IdAccessorT>::getRecord(row), subRow, subColumn);
} }
template<typename ESXRecordT, typename IdAccessorT> template<typename ESXRecordT, typename IdAccessorT>
void SubCellCollection<ESXRecordT, IdAccessorT>::setNestedData(int row, void SubCellCollection<ESXRecordT, IdAccessorT>::setNestedData(int row,
int column, const QVariant& data, int subRow, int subColumn) int column, const QVariant& data, int subRow, int subColumn)
{ {
getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column))->setNestedData(getRecord(row), data, subRow, subColumn); getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column))->setNestedData(
Collection<ESXRecordT, IdAccessorT>::getRecord(row), data, subRow, subColumn);
} }
template<typename ESXRecordT, typename IdAccessorT> template<typename ESXRecordT, typename IdAccessorT>
CSMWorld::NestedTableWrapperBase* SubCellCollection<ESXRecordT, IdAccessorT>::nestedTable(int row, CSMWorld::NestedTableWrapperBase* SubCellCollection<ESXRecordT, IdAccessorT>::nestedTable(int row,
int column) const int column) const
{ {
return getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column))->nestedTable(getRecord(row)); return getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column))->nestedTable(
Collection<ESXRecordT, IdAccessorT>::getRecord(row));
} }
template<typename ESXRecordT, typename IdAccessorT> template<typename ESXRecordT, typename IdAccessorT>
void SubCellCollection<ESXRecordT, IdAccessorT>::setNestedTable(int row, void SubCellCollection<ESXRecordT, IdAccessorT>::setNestedTable(int row,
int column, const CSMWorld::NestedTableWrapperBase& nestedTable) int column, const CSMWorld::NestedTableWrapperBase& nestedTable)
{ {
getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column))->setNestedTable(getRecord(row), nestedTable); getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column))->setNestedTable(
Collection<ESXRecordT, IdAccessorT>::getRecord(row), nestedTable);
} }
template<typename ESXRecordT, typename IdAccessorT> template<typename ESXRecordT, typename IdAccessorT>
int SubCellCollection<ESXRecordT, IdAccessorT>::getNestedRowsCount(int row, int column) const int SubCellCollection<ESXRecordT, IdAccessorT>::getNestedRowsCount(int row, int column) const
{ {
return getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column))->getNestedRowsCount(getRecord(row)); return getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column))->getNestedRowsCount(
Collection<ESXRecordT, IdAccessorT>::getRecord(row));
} }
template<typename ESXRecordT, typename IdAccessorT> template<typename ESXRecordT, typename IdAccessorT>
int SubCellCollection<ESXRecordT, IdAccessorT>::getNestedColumnsCount(int row, int column) const int SubCellCollection<ESXRecordT, IdAccessorT>::getNestedColumnsCount(int row, int column) const
{ {
return getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column))->getNestedColumnsCount(getRecord(row)); return getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column))->getNestedColumnsCount(
Collection<ESXRecordT, IdAccessorT>::getRecord(row));
} }
template<typename ESXRecordT, typename IdAccessorT> template<typename ESXRecordT, typename IdAccessorT>