From f4334da42ec0076c073aed1a3aec6a4a17f1ba5a Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 23 May 2014 09:32:34 +0200
Subject: [PATCH] added changed reference tracking for cells

---
 apps/opencs/model/world/cell.hpp          |  7 ++--
 apps/opencs/model/world/columnimp.hpp     | 40 +++++++++++++++++++++++
 apps/opencs/model/world/refcollection.cpp |  6 ++++
 3 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/model/world/cell.hpp b/apps/opencs/model/world/cell.hpp
index a47dbf45d..8a2781590 100644
--- a/apps/opencs/model/world/cell.hpp
+++ b/apps/opencs/model/world/cell.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_WOLRD_CELL_H
 #define CSM_WOLRD_CELL_H
 
-#include <vector>
+#include <set>
 #include <string>
 
 #include <components/esm/loadcell.hpp>
@@ -16,8 +16,11 @@ namespace CSMWorld
     {
         std::string mId;
 
-        void load (ESM::ESMReader &esm);
+        /// These are the references modified by the edited content file. These are stored in
+        /// mModified only.
+        std::set<std::string> mTouchedRefs;
 
+        void load (ESM::ESMReader &esm);
     };
 }
 
diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp
index 6976b454d..6b276d151 100644
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@@ -10,6 +10,7 @@
 #include "columnbase.hpp"
 #include "columns.hpp"
 #include "info.hpp"
+#include "cell.hpp"
 
 namespace CSMWorld
 {
@@ -87,6 +88,45 @@ namespace CSMWorld
         }
     };
 
+    /// \brief Specialisation that takes care of the modified reference tracking
+    template<>
+    struct RecordStateColumn<Cell> : public Column<Cell>
+    {
+        RecordStateColumn<Cell>()
+        : Column<Cell> (Columns::ColumnId_Modification, ColumnBase::Display_RecordState)
+        {}
+
+        virtual QVariant get (const Record<Cell>& record) const
+        {
+            if (record.mState==Record<Cell>::State_Erased)
+                return static_cast<int> (Record<Cell>::State_Deleted);
+
+            if (!record.mModified.mTouchedRefs.empty() &&
+                !record.mState==Record<Cell>::State_Deleted &&
+                !record.mState==Record<Cell>::State_ModifiedOnly)
+            {
+                static_cast<int> (Record<Cell>::State_Modified);
+            }
+
+            return static_cast<int> (record.mState);
+        }
+
+        virtual void set (Record<Cell>& record, const QVariant& data)
+        {
+            record.mState = static_cast<RecordBase::State> (data.toInt());
+        }
+
+        virtual bool isEditable() const
+        {
+            return true;
+        }
+
+        virtual bool isUserEditable() const
+        {
+            return false;
+        }
+    };
+
     template<typename ESXRecordT>
     struct FixedRecordTypeColumn : public Column<ESXRecordT>
     {
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index 3a60c4934..1cfa4df76 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -53,6 +53,8 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
             }
             else
             {
+                cell.mModified.mTouchedRefs.insert (Misc::StringUtils::lowerCase (
+                    mCells.getId (cellIndex)));
                 record.mState = RecordBase::State_Deleted;
                 setRecord (index, record);
             }
@@ -60,6 +62,10 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
             continue;
         }
 
+        if (!base)
+            cell.mModified.mTouchedRefs.insert (Misc::StringUtils::lowerCase (
+                mCells.getId (cellIndex)));
+
         if (iter==cache.end())
         {
             // new reference