From cb004936e03cc802211d31ee165f3670fcbe1989 Mon Sep 17 00:00:00 2001
From: Marek Kochanowicz <sirherrbatka@gmail.com>
Date: Mon, 21 Jul 2014 14:34:48 +0200
Subject: [PATCH] moved setNestedData to the helper as well

---
 apps/opencs/model/world/nestedadaptors.hpp  | 23 +++++++++++++++++++++
 apps/opencs/model/world/refidadapterimp.cpp | 19 ++---------------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/apps/opencs/model/world/nestedadaptors.hpp b/apps/opencs/model/world/nestedadaptors.hpp
index d5edf33584..8f82482d85 100644
--- a/apps/opencs/model/world/nestedadaptors.hpp
+++ b/apps/opencs/model/world/nestedadaptors.hpp
@@ -2,6 +2,7 @@
 #define CSM_WORLD_NESTEDADAPTORS_H
 
 #include <vector>
+#include <stdexcept>
 
 #include "universalid.hpp"
 #include "nestedtablewrapper.hpp"
@@ -59,6 +60,28 @@ namespace CSMWorld
                 throw std::logic_error("Trying to access non-existing column in the nested table!");
             }
         }
+
+        void setNestedData (const RefIdColumn *column,
+                            RefIdData& data,
+                            int index,
+                            const QVariant& value,
+                            int subRowIndex,
+                            int subColIndex) const
+        {
+            switch(subColIndex)
+            {
+            case 0:
+                getRecord(data, index).get().mInventory.mList.at(subRowIndex).mItem.assign(std::string(value.toString().toUtf8().constData()));
+                break;
+
+            case 1:
+                getRecord(data, index).get().mInventory.mList.at(subRowIndex).mCount = value.toInt();
+                break;
+                
+            default:
+                throw std::logic_error("Trying to access non-existing column in the nested table!");
+            }
+        }
         
     private:
 
diff --git a/apps/opencs/model/world/refidadapterimp.cpp b/apps/opencs/model/world/refidadapterimp.cpp
index 3622c77af4..3600562d39 100644
--- a/apps/opencs/model/world/refidadapterimp.cpp
+++ b/apps/opencs/model/world/refidadapterimp.cpp
@@ -285,23 +285,8 @@ void CSMWorld::ContainerRefIdAdapter::setNestedData(const RefIdColumn *column,
 {
 
     if (column==mContent)
-    {
-        Record<ESM::Container>& record = static_cast<Record<ESM::Container>&> (
-            data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Container)));
-
-        switch (subColIndex)
-        {
-            case 0:
-                record.get().mInventory.mList.at(subRowIndex).mItem.assign(std::string(value.toString().toUtf8().constData()));
-                break;
-
-            case 1:
-                record.get().mInventory.mList.at(subRowIndex).mCount = value.toInt();
-                break;
-
-            default:
-                throw std::logic_error("Trying to access non-existing column in the nested table!");
-        }
+    { 
+        mHelper.setNestedData(column, data, index, value, subRowIndex, subColIndex);
     } else
     {
         assert(false);