From fa9c6b19c2513b4fef821514b193b86c08cbe090 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sun, 10 Aug 2014 21:03:45 +0200
Subject: [PATCH] removed OpenCS-specific custom Filter record struct (default
 ESM struct will do from now on)

---
 apps/opencs/CMakeLists.txt             |  4 ----
 apps/opencs/model/doc/saving.cpp       |  2 +-
 apps/opencs/model/doc/savingstages.hpp |  2 --
 apps/opencs/model/filter/filter.hpp    | 17 -----------------
 apps/opencs/model/filter/parser.cpp    |  2 +-
 apps/opencs/model/world/data.cpp       | 14 +++++++-------
 apps/opencs/model/world/data.hpp       |  9 ++++-----
 7 files changed, 13 insertions(+), 37 deletions(-)
 delete mode 100644 apps/opencs/model/filter/filter.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index a5fe77dd97..2574eb111f 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -126,10 +126,6 @@ opencs_units_noqt (model/filter
     node unarynode narynode leafnode booleannode parser andnode ornode notnode textnode valuenode
     )
 
-opencs_hdrs_noqt (model/filter
-    filter
-    )
-
 opencs_units (view/filter
     filterbox recordfilterbox editwidget
     )
diff --git a/apps/opencs/model/doc/saving.cpp b/apps/opencs/model/doc/saving.cpp
index 506bdc0ae5..6769469306 100644
--- a/apps/opencs/model/doc/saving.cpp
+++ b/apps/opencs/model/doc/saving.cpp
@@ -17,7 +17,7 @@ CSMDoc::Saving::Saving (Document& document, const boost::filesystem::path& proje
 
     appendStage (new WriteHeaderStage (mDocument, mState, true));
 
-    appendStage (new WriteCollectionStage<CSMWorld::IdCollection<CSMFilter::Filter> > (
+    appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::Filter> > (
         mDocument.getData().getFilters(), mState, CSMWorld::Scope_Project));
 
     appendStage (new CloseSaveStage (mState));
diff --git a/apps/opencs/model/doc/savingstages.hpp b/apps/opencs/model/doc/savingstages.hpp
index 700983dce7..d766b774eb 100644
--- a/apps/opencs/model/doc/savingstages.hpp
+++ b/apps/opencs/model/doc/savingstages.hpp
@@ -7,8 +7,6 @@
 #include "../world/idcollection.hpp"
 #include "../world/scope.hpp"
 
-#include "../filter/filter.hpp"
-
 #include "savingstate.hpp"
 
 namespace ESM
diff --git a/apps/opencs/model/filter/filter.hpp b/apps/opencs/model/filter/filter.hpp
deleted file mode 100644
index 0c71ad3332..0000000000
--- a/apps/opencs/model/filter/filter.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef CSM_FILTER_FILTER_H
-#define CSM_FILTER_FILTER_H
-
-#include <vector>
-#include <string>
-
-#include <components/esm/filter.hpp>
-
-namespace CSMFilter
-{
-    /// \brief Wrapper for Filter record
-    struct Filter : public ESM::Filter
-    {
-    };
-}
-
-#endif
\ No newline at end of file
diff --git a/apps/opencs/model/filter/parser.cpp b/apps/opencs/model/filter/parser.cpp
index bec445cbc4..51338dfc98 100644
--- a/apps/opencs/model/filter/parser.cpp
+++ b/apps/opencs/model/filter/parser.cpp
@@ -596,7 +596,7 @@ bool CSMFilter::Parser::parse (const std::string& filter, bool allowPredefined)
             return false;
         }
 
-        const CSMWorld::Record<CSMFilter::Filter>& record = mData.getFilters().getRecord (index);
+        const CSMWorld::Record<ESM::Filter>& record = mData.getFilters().getRecord (index);
 
         if (record.isDeleted())
         {
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index f17ac6e4cb..2f837d63b1 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -251,11 +251,11 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourc
     mRefs.addColumn (new KeyColumn<CellRef>);
     mRefs.addColumn (new TrapColumn<CellRef>);
 
-    mFilters.addColumn (new StringIdColumn<CSMFilter::Filter>);
-    mFilters.addColumn (new RecordStateColumn<CSMFilter::Filter>);
-    mFilters.addColumn (new FixedRecordTypeColumn<CSMFilter::Filter> (UniversalId::Type_Filter));
-    mFilters.addColumn (new FilterColumn<CSMFilter::Filter>);
-    mFilters.addColumn (new DescriptionColumn<CSMFilter::Filter>);
+    mFilters.addColumn (new StringIdColumn<ESM::Filter>);
+    mFilters.addColumn (new RecordStateColumn<ESM::Filter>);
+    mFilters.addColumn (new FixedRecordTypeColumn<ESM::Filter> (UniversalId::Type_Filter));
+    mFilters.addColumn (new FilterColumn<ESM::Filter>);
+    mFilters.addColumn (new DescriptionColumn<ESM::Filter>);
 
     mDebugProfiles.addColumn (new StringIdColumn<ESM::DebugProfile>);
     mDebugProfiles.addColumn (new RecordStateColumn<ESM::DebugProfile>);
@@ -488,12 +488,12 @@ CSMWorld::RefCollection& CSMWorld::Data::getReferences()
     return mRefs;
 }
 
-const CSMWorld::IdCollection<CSMFilter::Filter>& CSMWorld::Data::getFilters() const
+const CSMWorld::IdCollection<ESM::Filter>& CSMWorld::Data::getFilters() const
 {
     return mFilters;
 }
 
-CSMWorld::IdCollection<CSMFilter::Filter>& CSMWorld::Data::getFilters()
+CSMWorld::IdCollection<ESM::Filter>& CSMWorld::Data::getFilters()
 {
     return mFilters;
 }
diff --git a/apps/opencs/model/world/data.hpp b/apps/opencs/model/world/data.hpp
index ab22096b2a..d0a07c6777 100644
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@@ -24,11 +24,10 @@
 #include <components/esm/loadench.hpp>
 #include <components/esm/loadbody.hpp>
 #include <components/esm/debugprofile.hpp>
+#include <components/esm/filter.hpp>
 
 #include <components/to_utf8/to_utf8.hpp>
 
-#include "../filter/filter.hpp"
-
 #include "../doc/stage.hpp"
 
 #include "idcollection.hpp"
@@ -77,7 +76,7 @@ namespace CSMWorld
             IdCollection<Cell> mCells;
             RefIdCollection mReferenceables;
             RefCollection mRefs;
-            IdCollection<CSMFilter::Filter> mFilters;
+            IdCollection<ESM::Filter> mFilters;
             const ResourcesManager& mResourcesManager;
             std::vector<QAbstractItemModel *> mModels;
             std::map<UniversalId::Type, QAbstractItemModel *> mModelIndex;
@@ -180,9 +179,9 @@ namespace CSMWorld
 
             RefCollection& getReferences();
 
-            const IdCollection<CSMFilter::Filter>& getFilters() const;
+            const IdCollection<ESM::Filter>& getFilters() const;
 
-            IdCollection<CSMFilter::Filter>& getFilters();
+            IdCollection<ESM::Filter>& getFilters();
 
             const IdCollection<ESM::Enchantment>& getEnchantments() const;