removed mScope field from Filter record (redundant now)

apps/opencs/model/filter/filter.hpp

@@ -11,14 +11,6 @@ namespace CSMFilter
     /// \brief Wrapper for Filter record
     struct Filter : public ESM::Filter
     {
-        enum Scope
-        {
-            Scope_Project = 0, // per project
-            Scope_Session = 1, // exists only for one editing session; not saved
-            Scope_Content = 2 // embedded in the edited content file
-        };
-
-        Scope mScope;
     };
 }
 

apps/opencs/model/world/columnimp.hpp

@@ -1224,36 +1224,6 @@ namespace CSMWorld
         }
     };
 
-    template<typename ESXRecordT>
-    struct ScopeColumn : public Column<ESXRecordT>
-    {
-        ScopeColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_Scope, ColumnBase::Display_Integer, 0)
-        {}
-
-        virtual QVariant get (const Record<ESXRecordT>& record) const
-        {
-            return static_cast<int> (record.get().mScope);
-        }
-
-        virtual void set (Record<ESXRecordT>& record, const QVariant& data)
-        {
-            ESXRecordT record2 = record.get();
-            record2.mScope = static_cast<CSMFilter::Filter::Scope> (data.toInt());
-            record.setModified (record2);
-        }
-
-        virtual bool isEditable() const
-        {
-            return true;
-        }
-
-        virtual bool isUserEditable() const
-        {
-            return false;
-        }
-    };
-
 
     template<typename ESXRecordT>
     struct PosColumn : public Column<ESXRecordT>

apps/opencs/model/world/columns.cpp

@@ -172,7 +172,6 @@ namespace CSMWorld
             { ColumnId_Rank, "Rank" },
             { ColumnId_Gender, "Gender" },
             { ColumnId_PcRank, "PC Rank" },
-            { ColumnId_Scope, "Scope" },
             { ColumnId_ReferenceableId, "Referenceable ID" },
             { ColumnId_CombatState, "Combat" },
             { ColumnId_MagicState, "Magic" },

apps/opencs/model/world/columns.hpp

@@ -165,7 +165,6 @@ namespace CSMWorld
             ColumnId_Rank = 152,
             ColumnId_Gender = 153,
             ColumnId_PcRank = 154,
-            ColumnId_Scope = 155,
             ColumnId_ReferenceableId = 156,
             ColumnId_CombatState = 157,
             ColumnId_MagicState = 158,

apps/opencs/model/world/data.cpp

@@ -256,7 +256,6 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourc
     mFilters.addColumn (new FixedRecordTypeColumn<CSMFilter::Filter> (UniversalId::Type_Filter));
     mFilters.addColumn (new FilterColumn<CSMFilter::Filter>);
     mFilters.addColumn (new DescriptionColumn<CSMFilter::Filter>);
-    mFilters.addColumn (new ScopeColumn<CSMFilter::Filter>);
 
     mDebugProfiles.addColumn (new StringIdColumn<ESM::DebugProfile>);
     mDebugProfiles.addColumn (new RecordStateColumn<ESM::DebugProfile>);
@@ -717,9 +716,6 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Stage::Messages& messages)
             }
 
             mFilters.load (*mReader, mBase);
-            mFilters.setData (mFilters.getSize()-1,
-                mFilters.findColumnIndex (CSMWorld::Columns::ColumnId_Scope),
-                static_cast<int> (CSMFilter::Filter::Scope_Project));
             break;
 
         case ESM::REC_DBGP:

apps/opencs/view/world/subviews.cpp

@@ -3,8 +3,6 @@
 
 #include "../doc/subviewfactoryimp.hpp"
 
-#include "../filter/filtercreator.hpp"
-
 #include "tablesubview.hpp"
 #include "dialoguesubview.hpp"
 #include "scriptsubview.hpp"