From 8b1ac451acd0b5f3838d0a46e2cd7dd150d25f73 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Sun, 19 Apr 2015 09:42:44 +1000
Subject: [PATCH] More warning fixes.

---
 apps/opencs/model/world/nestedcoladapterimp.cpp |  8 ++++----
 apps/opencs/model/world/nestedcoladapterimp.hpp | 12 ++++++------
 apps/opencs/model/world/nestedcolumnadapter.hpp |  2 +-
 apps/opencs/model/world/nestedidcollection.hpp  |  2 +-
 apps/opencs/model/world/refidadapterimp.hpp     | 10 +---------
 5 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/apps/opencs/model/world/nestedcoladapterimp.cpp b/apps/opencs/model/world/nestedcoladapterimp.cpp
index bd6a5c449..bfb2fb578 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.cpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.cpp
@@ -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);
diff --git a/apps/opencs/model/world/nestedcoladapterimp.hpp b/apps/opencs/model/world/nestedcoladapterimp.hpp
index 8d0b0ce7a..4a7101cba 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.hpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.hpp
@@ -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);
diff --git a/apps/opencs/model/world/nestedcolumnadapter.hpp b/apps/opencs/model/world/nestedcolumnadapter.hpp
index 5e7256fa7..462b5a5ab 100644
--- a/apps/opencs/model/world/nestedcolumnadapter.hpp
+++ b/apps/opencs/model/world/nestedcolumnadapter.hpp
@@ -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;
 
diff --git a/apps/opencs/model/world/nestedidcollection.hpp b/apps/opencs/model/world/nestedidcollection.hpp
index 2b795f9c6..792a13b7d 100644
--- a/apps/opencs/model/world/nestedidcollection.hpp
+++ b/apps/opencs/model/world/nestedidcollection.hpp
@@ -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));
     }
 
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index 9556c83e3..d3d52d2e1 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -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 =