From 23db79ebab328298a8a39783299c3ca7e01a0dc7 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Thu, 9 Apr 2015 20:53:41 +1000
Subject: [PATCH] Fix for more gcc differences.

---
 apps/opencs/model/world/commands.hpp          |  2 +-
 apps/opencs/model/world/idadapter.hpp         |  2 +-
 apps/opencs/model/world/idtree.hpp            |  2 +-
 apps/opencs/model/world/nestedcollection.hpp  |  2 +-
 apps/opencs/model/world/refidadapter.hpp      |  2 +-
 apps/opencs/model/world/refidadapterimp.hpp   |  2 +-
 apps/opencs/model/world/refidcollection.hpp   |  2 +-
 apps/opencs/model/world/subcellcollection.hpp | 24 ++++++++++++-------
 8 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/apps/opencs/model/world/commands.hpp b/apps/opencs/model/world/commands.hpp
index 42405a2f9..a70b36178 100644
--- a/apps/opencs/model/world/commands.hpp
+++ b/apps/opencs/model/world/commands.hpp
@@ -22,7 +22,7 @@ namespace CSMWorld
     class IdTable;
     class IdTree;
     struct RecordBase;
-    class NestedTableWrapperBase;
+    struct NestedTableWrapperBase;
 
     class ModifyCommand : public QUndoCommand
     {
diff --git a/apps/opencs/model/world/idadapter.hpp b/apps/opencs/model/world/idadapter.hpp
index bec21a0f3..753ac01f0 100644
--- a/apps/opencs/model/world/idadapter.hpp
+++ b/apps/opencs/model/world/idadapter.hpp
@@ -7,7 +7,7 @@ class QVariant;
 
 namespace CSMWorld
 {
-    class NestedTableWrapperBase;
+    struct NestedTableWrapperBase;
 
     template<typename ESXRecordT>
     class NestedIdAdapter
diff --git a/apps/opencs/model/world/idtree.hpp b/apps/opencs/model/world/idtree.hpp
index 80b44d241..d06d86a4f 100644
--- a/apps/opencs/model/world/idtree.hpp
+++ b/apps/opencs/model/world/idtree.hpp
@@ -20,7 +20,7 @@ namespace CSMWorld
 {
     class NestedCollection;
     struct RecordBase;
-    class NestedTableWrapperBase; // FIXME: is this necessary?
+    struct NestedTableWrapperBase;
 
     class IdTree : public IdTable
     {
diff --git a/apps/opencs/model/world/nestedcollection.hpp b/apps/opencs/model/world/nestedcollection.hpp
index 8046f9a09..b075f53c4 100644
--- a/apps/opencs/model/world/nestedcollection.hpp
+++ b/apps/opencs/model/world/nestedcollection.hpp
@@ -6,7 +6,7 @@ class QVariant;
 namespace CSMWorld
 {
     class NestableColumn;
-    class NestedTableWrapperBase;
+    struct NestedTableWrapperBase;
 
     class NestedCollection
     {
diff --git a/apps/opencs/model/world/refidadapter.hpp b/apps/opencs/model/world/refidadapter.hpp
index 7f7d00413..91f19577b 100644
--- a/apps/opencs/model/world/refidadapter.hpp
+++ b/apps/opencs/model/world/refidadapter.hpp
@@ -20,7 +20,7 @@ namespace CSMWorld
     class RefIdColumn;
     class RefIdData;
     struct RecordBase;
-    class NestedTableWrapperBase;
+    struct NestedTableWrapperBase;
     class HelperBase;
 
     class RefIdAdapter
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index f72c0d196..7296b6c68 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -16,7 +16,7 @@
 
 namespace CSMWorld
 {
-    class NestedTableWrapperBase;
+    struct NestedTableWrapperBase;
 
     struct BaseColumns
     {
diff --git a/apps/opencs/model/world/refidcollection.hpp b/apps/opencs/model/world/refidcollection.hpp
index 2a271a846..5bf7c177e 100644
--- a/apps/opencs/model/world/refidcollection.hpp
+++ b/apps/opencs/model/world/refidcollection.hpp
@@ -18,7 +18,7 @@ namespace ESM
 namespace CSMWorld
 {
     class RefIdAdapter;
-    class NestedTableWrapperBase;
+    struct NestedTableWrapperBase;
 
     class RefIdColumn : public NestableColumn
     {
diff --git a/apps/opencs/model/world/subcellcollection.hpp b/apps/opencs/model/world/subcellcollection.hpp
index 919a0a604..92091cf57 100644
--- a/apps/opencs/model/world/subcellcollection.hpp
+++ b/apps/opencs/model/world/subcellcollection.hpp
@@ -102,53 +102,61 @@ namespace CSMWorld
     template<typename ESXRecordT, typename IdAccessorT>
     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>
     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>
     QVariant SubCellCollection<ESXRecordT, IdAccessorT>::getNestedData (int row,
             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>
     void SubCellCollection<ESXRecordT, IdAccessorT>::setNestedData(int row,
             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>
     CSMWorld::NestedTableWrapperBase* SubCellCollection<ESXRecordT, IdAccessorT>::nestedTable(int row,
             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>
     void SubCellCollection<ESXRecordT, IdAccessorT>::setNestedTable(int row,
             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>
     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>
     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>