some general cleanup; fixed two cases of dialogue subviews that allowed creating records where they shouldn't have

apps/opencs/view/world/subviews.cpp

@@ -80,30 +80,35 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
 
     manager.add (CSMWorld::UniversalId::Type_Scene, new CSVDoc::SubViewFactory<SceneSubView>);
 
-    //edit subviews
-    manager.add (CSMWorld::UniversalId::Type_Region,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<GenericCreator> > (false));
-
-    manager.add (CSMWorld::UniversalId::Type_Spell,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<GenericCreator> > (false));
+    // Dialogue subviews
+    static const CSMWorld::UniversalId::Type sTableTypes2[] =
+    {
+        CSMWorld::UniversalId::Type_Region,
+        CSMWorld::UniversalId::Type_Spell,
+        CSMWorld::UniversalId::Type_Birthsign,
+        CSMWorld::UniversalId::Type_Global,
+        CSMWorld::UniversalId::Type_Race,
+        CSMWorld::UniversalId::Type_Class,
+        CSMWorld::UniversalId::Type_Filter,
+        CSMWorld::UniversalId::Type_Sound,
+        CSMWorld::UniversalId::Type_Faction,
 
-    manager.add (CSMWorld::UniversalId::Type_Referenceable,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<ReferenceableCreator> > (false));
+        CSMWorld::UniversalId::Type_None // end marker
+    };
 
-    manager.add (CSMWorld::UniversalId::Type_Birthsign,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<GenericCreator> > (false));
+    for (int i=0; sTableTypes2[i]!=CSMWorld::UniversalId::Type_None; ++i)
+        manager.add (sTableTypes2[i],
+            new CSVDoc::SubViewFactoryWithCreator<DialogueSubView,
+            CreatorFactory<GenericCreator> > (false));
 
-    manager.add (CSMWorld::UniversalId::Type_Global,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<GenericCreator> > (false));
+    manager.add (CSMWorld::UniversalId::Type_Skill,
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, NullCreatorFactory > (false));
 
     manager.add (CSMWorld::UniversalId::Type_Gmst,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<GenericCreator> > (false));
-
-    manager.add (CSMWorld::UniversalId::Type_Race,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<GenericCreator> > (false));
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, NullCreatorFactory > (false));
 
-    manager.add (CSMWorld::UniversalId::Type_Class,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<GenericCreator> > (false));
+    manager.add (CSMWorld::UniversalId::Type_Referenceable,
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<ReferenceableCreator> > (false));
 
     manager.add (CSMWorld::UniversalId::Type_Reference,
         new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<ReferenceCreator> > (false));
@@ -111,18 +116,6 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
     manager.add (CSMWorld::UniversalId::Type_Cell,
         new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<CellCreator> > (false));
 
-    manager.add (CSMWorld::UniversalId::Type_Filter,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<GenericCreator> > (false));
-
-    manager.add (CSMWorld::UniversalId::Type_Sound,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<GenericCreator> > (false));
-
-    manager.add (CSMWorld::UniversalId::Type_Faction,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<GenericCreator> > (false));
-
-    manager.add (CSMWorld::UniversalId::Type_Skill,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<GenericCreator> > (false));
-
     manager.add (CSMWorld::UniversalId::Type_JournalInfo,
         new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<InfoCreator> > (false));