move most of the files from esm to esm3, keep common code in esm; this is make space for a future with esm4

esm typo

esm typo

apps/benchmarks/detournavigator/navmeshtilescache.cpp

@@ -1,7 +1,7 @@
 #include <benchmark/benchmark.h>
 
 #include <components/detournavigator/navmeshtilescache.hpp>
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 
 #include <algorithm>
 #include <random>

apps/esmtool/esmtool.cpp

@@ -10,8 +10,8 @@
 
 #include <boost/program_options.hpp>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/esm/records.hpp>
 
 #include "record.hpp"

apps/esmtool/labels.cpp

@@ -1,17 +1,17 @@
 #include "labels.hpp"
 
-#include <components/esm/loadbody.hpp>
-#include <components/esm/loadcell.hpp>
-#include <components/esm/loadcont.hpp>
-#include <components/esm/loadcrea.hpp>
-#include <components/esm/loadench.hpp>
-#include <components/esm/loadlevlist.hpp>
-#include <components/esm/loadligh.hpp>
-#include <components/esm/loadmgef.hpp>
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/loadrace.hpp>
-#include <components/esm/loadspel.hpp>
-#include <components/esm/loadweap.hpp>
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadlevlist.hpp>
+#include <components/esm3/loadligh.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadspel.hpp>
+#include <components/esm3/loadweap.hpp>
 
 #include <components/misc/stringops.hpp>
 

apps/essimporter/convertacdt.hpp

@@ -1,10 +1,10 @@
 #ifndef OPENMW_ESSIMPORT_CONVERTACDT_H
 #define OPENMW_ESSIMPORT_CONVERTACDT_H
 
-#include <components/esm/creaturestats.hpp>
-#include <components/esm/npcstats.hpp>
-#include <components/esm/loadskil.hpp>
-#include <components/esm/animationstate.hpp>
+#include <components/esm3/creaturestats.hpp>
+#include <components/esm3/npcstats.hpp>
+#include <components/esm3/loadskil.hpp>
+#include <components/esm3/animationstate.hpp>
 
 #include "importacdt.hpp"
 

apps/essimporter/convertcntc.hpp

@@ -3,7 +3,7 @@
 
 #include "importcntc.hpp"
 
-#include <components/esm/containerstate.hpp>
+#include <components/esm3/containerstate.hpp>
 
 namespace ESSImport
 {

apps/essimporter/convertcrec.hpp

@@ -3,7 +3,7 @@
 
 #include "importcrec.hpp"
 
-#include <components/esm/creaturestate.hpp>
+#include <components/esm3/creaturestate.hpp>
 
 namespace ESSImport
 {

apps/essimporter/converter.cpp

@@ -5,8 +5,8 @@
 
 #include <osgDB/WriteFile>
 
-#include <components/esm/creaturestate.hpp>
-#include <components/esm/containerstate.hpp>
+#include <components/esm3/creaturestate.hpp>
+#include <components/esm3/containerstate.hpp>
 
 #include <components/misc/constants.hpp>
 

apps/essimporter/converter.hpp

@@ -6,23 +6,23 @@
 #include <osg/Image>
 #include <osg/ref_ptr>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
-
-#include <components/esm/loadcell.hpp>
-#include <components/esm/loadbook.hpp>
-#include <components/esm/loadclas.hpp>
-#include <components/esm/loadglob.hpp>
-#include <components/esm/cellstate.hpp>
-#include <components/esm/loadfact.hpp>
-#include <components/esm/dialoguestate.hpp>
-#include <components/esm/custommarkerstate.hpp>
-#include <components/esm/loadcrea.hpp>
-#include <components/esm/weatherstate.hpp>
-#include <components/esm/globalscript.hpp>
-#include <components/esm/queststate.hpp>
-#include <components/esm/stolenitems.hpp>
-#include <components/esm/projectilestate.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadbook.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadglob.hpp>
+#include <components/esm3/cellstate.hpp>
+#include <components/esm3/loadfact.hpp>
+#include <components/esm3/dialoguestate.hpp>
+#include <components/esm3/custommarkerstate.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/weatherstate.hpp>
+#include <components/esm3/globalscript.hpp>
+#include <components/esm3/queststate.hpp>
+#include <components/esm3/stolenitems.hpp>
+#include <components/esm3/projectilestate.hpp>
 
 #include "importcrec.hpp"
 #include "importcntc.hpp"

apps/essimporter/convertinventory.hpp

@@ -3,7 +3,7 @@
 
 #include "importinventory.hpp"
 
-#include <components/esm/inventorystate.hpp>
+#include <components/esm3/inventorystate.hpp>
 
 namespace ESSImport
 {

apps/essimporter/convertnpcc.hpp

@@ -3,7 +3,7 @@
 
 #include "importnpcc.hpp"
 
-#include <components/esm/npcstate.hpp>
+#include <components/esm3/npcstate.hpp>
 
 namespace ESSImport
 {

apps/essimporter/convertplayer.hpp

@@ -3,8 +3,8 @@
 
 #include "importplayer.hpp"
 
-#include <components/esm/player.hpp>
-#include <components/esm/controlsstate.hpp>
+#include <components/esm3/player.hpp>
+#include <components/esm3/controlsstate.hpp>
 
 namespace ESSImport
 {

apps/essimporter/convertscpt.hpp

@@ -1,7 +1,7 @@
 #ifndef OPENMW_ESSIMPORT_CONVERTSCPT_H
 #define OPENMW_ESSIMPORT_CONVERTSCPT_H
 
-#include <components/esm/globalscript.hpp>
+#include <components/esm3/globalscript.hpp>
 
 #include "importscpt.hpp"
 

apps/essimporter/convertscri.hpp

@@ -3,7 +3,7 @@
 
 #include "importscri.hpp"
 
-#include <components/esm/locals.hpp>
+#include <components/esm3/locals.hpp>
 
 namespace ESSImport
 {

apps/essimporter/importacdt.cpp

@@ -1,8 +1,8 @@
 #include "importacdt.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 
 namespace ESSImport
 {

apps/essimporter/importacdt.hpp

@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 
 #include "importscri.hpp"
 

apps/essimporter/importcellref.cpp

@@ -1,6 +1,6 @@
 #include "importcellref.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {

apps/essimporter/importcellref.hpp

@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 
 #include "importacdt.hpp"
 

apps/essimporter/importcntc.cpp

@@ -1,6 +1,6 @@
 #include "importcntc.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {

apps/essimporter/importcrec.cpp

@@ -1,6 +1,6 @@
 #include "importcrec.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {

apps/essimporter/importcrec.hpp

@@ -2,7 +2,7 @@
 #define OPENMW_ESSIMPORT_CREC_H
 
 #include "importinventory.hpp"
-#include <components/esm/aipackage.hpp>
+#include <components/esm3/aipackage.hpp>
 
 namespace ESM
 {

apps/essimporter/importdial.cpp

@@ -1,6 +1,6 @@
 #include "importdial.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {

apps/essimporter/importer.cpp

@@ -8,20 +8,20 @@
 #include <osgDB/ReadFile>
 #include <osg/ImageUtils>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/esm/defs.hpp>
 
-#include <components/esm/savedgame.hpp>
-#include <components/esm/player.hpp>
+#include <components/esm3/savedgame.hpp>
+#include <components/esm3/player.hpp>
 
-#include <components/esm/loadalch.hpp>
-#include <components/esm/loadspel.hpp>
-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadweap.hpp>
-#include <components/esm/loadclot.hpp>
-#include <components/esm/loadench.hpp>
-#include <components/esm/loadlevlist.hpp>
+#include <components/esm3/loadalch.hpp>
+#include <components/esm3/loadspel.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadweap.hpp>
+#include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadlevlist.hpp>
 
 #include <components/misc/constants.hpp>
 

apps/essimporter/importercontext.hpp

@@ -3,13 +3,13 @@
 
 #include <map>
 
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/player.hpp>
-#include <components/esm/dialoguestate.hpp>
-#include <components/esm/globalmap.hpp>
-#include <components/esm/loadcrea.hpp>
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/controlsstate.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/player.hpp>
+#include <components/esm3/dialoguestate.hpp>
+#include <components/esm3/globalmap.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/controlsstate.hpp>
 
 #include "importnpcc.hpp"
 #include "importcrec.hpp"

apps/essimporter/importgame.cpp

@@ -1,6 +1,6 @@
 #include "importgame.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {

apps/essimporter/importinfo.cpp

@@ -1,6 +1,6 @@
 #include "importinfo.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {

apps/essimporter/importinventory.cpp

@@ -2,7 +2,7 @@
 
 #include <stdexcept>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {

apps/essimporter/importinventory.hpp

@@ -4,7 +4,7 @@
 #include <vector>
 #include <string>
 
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 #include <components/esm/esmcommon.hpp>
 
 #include "importscri.hpp"

apps/essimporter/importjour.cpp

@@ -1,6 +1,6 @@
 #include "importjour.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {

apps/essimporter/importklst.cpp

@@ -1,6 +1,6 @@
 #include "importklst.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {

apps/essimporter/importnpcc.cpp

@@ -1,6 +1,6 @@
 #include "importnpcc.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {

apps/essimporter/importnpcc.hpp

@@ -1,9 +1,9 @@
 #ifndef OPENMW_ESSIMPORT_NPCC_H
 #define OPENMW_ESSIMPORT_NPCC_H
 
-#include <components/esm/loadcont.hpp>
+#include <components/esm3/loadcont.hpp>
 
-#include <components/esm/aipackage.hpp>
+#include <components/esm3/aipackage.hpp>
 
 #include "importinventory.hpp"
 

apps/essimporter/importplayer.cpp

@@ -1,6 +1,6 @@
 #include "importplayer.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {

apps/essimporter/importplayer.hpp

@@ -5,7 +5,7 @@
 #include <string>
 
 #include <components/esm/defs.hpp>
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 #include <components/esm/esmcommon.hpp>
 
 #include "importacdt.hpp"

apps/essimporter/importproj.cpp

@@ -1,6 +1,6 @@
 #include "importproj.h"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {

apps/essimporter/importques.cpp

@@ -1,6 +1,6 @@
 #include "importques.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {

apps/essimporter/importscpt.cpp

@@ -1,6 +1,6 @@
 #include "importscpt.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 
 

apps/essimporter/importscpt.hpp

@@ -3,7 +3,7 @@
 
 #include "importscri.hpp"
 
-#include <components/esm/loadscpt.hpp>
+#include <components/esm3/loadscpt.hpp>
 
 namespace ESM
 {

apps/essimporter/importscri.cpp

@@ -1,6 +1,6 @@
 #include "importscri.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {

apps/essimporter/importscri.hpp

@@ -1,7 +1,7 @@
 #ifndef OPENMW_ESSIMPORT_IMPORTSCRI_H
 #define OPENMW_ESSIMPORT_IMPORTSCRI_H
 
-#include <components/esm/variant.hpp>
+#include <components/esm3/variant.hpp>
 
 #include <vector>
 

apps/essimporter/importsplm.cpp

@@ -1,6 +1,6 @@
 #include "importsplm.h"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {

apps/launcher/utils/cellnameloader.cpp

@@ -1,6 +1,6 @@
 #include "cellnameloader.hpp"
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 #include <components/contentselector/view/contentselector.hpp>
 
 QSet<QString> CellNameLoader::getCellNames(QStringList &contentPaths)

apps/launcher/utils/cellnameloader.hpp

@@ -4,7 +4,7 @@
 #include <QSet>
 #include <QString>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESM {class ESMReader; struct Cell;}
 namespace ContentSelectorView {class ContentSelector;}

apps/mwiniimporter/importer.cpp

@@ -3,7 +3,7 @@
 #include <iostream>
 #include <sstream>
 #include <components/misc/stringops.hpp>
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>

apps/navmeshtool/main.cpp

@@ -4,8 +4,8 @@
 #include <components/debug/debugging.hpp>
 #include <components/detournavigator/navmeshdb.hpp>
 #include <components/detournavigator/recastglobalallocator.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/variant.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/variant.hpp>
 #include <components/esmloader/esmdata.hpp>
 #include <components/esmloader/load.hpp>
 #include <components/fallback/fallback.hpp>

apps/navmeshtool/navmesh.cpp

@@ -16,7 +16,7 @@
 #include <components/detournavigator/serialization.hpp>
 #include <components/detournavigator/tilecachedrecastmeshmanager.hpp>
 #include <components/detournavigator/tileposition.hpp>
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 #include <components/misc/guarded.hpp>
 #include <components/misc/progressreporter.hpp>
 #include <components/sceneutil/workqueue.hpp>

apps/navmeshtool/worldspacedata.cpp

@@ -7,10 +7,10 @@
 #include <components/detournavigator/objectid.hpp>
 #include <components/detournavigator/recastmesh.hpp>
 #include <components/detournavigator/tilecachedrecastmeshmanager.hpp>
-#include <components/esm/cellref.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/loadcell.hpp>
-#include <components/esm/loadland.hpp>
+#include <components/esm3/cellref.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/esmloader/esmdata.hpp>
 #include <components/esmloader/lessbyid.hpp>
 #include <components/esmloader/record.hpp>

apps/navmeshtool/worldspacedata.hpp

@@ -3,7 +3,7 @@
 
 #include <components/bullethelpers/collisionobject.hpp>
 #include <components/detournavigator/tilecachedrecastmeshmanager.hpp>
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/misc/convert.hpp>
 #include <components/resource/bulletshape.hpp>
 

apps/opencs/model/doc/runner.hpp

@@ -10,7 +10,7 @@
 #include <QProcess>
 #include <QTextDocument>
 
-#include <components/esm/debugprofile.hpp>
+#include <components/esm3/debugprofile.hpp>
 
 class QTemporaryFile;
 

apps/opencs/model/doc/savingstages.cpp

@@ -4,7 +4,7 @@
 
 #include <QUndoStack>
 
-#include <components/esm/loaddial.hpp>
+#include <components/esm3/loaddial.hpp>
 
 #include "../world/infocollection.hpp"
 #include "../world/cellcoordinates.hpp"

apps/opencs/model/doc/savingstate.hpp

@@ -8,7 +8,7 @@
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/fstream.hpp>
 
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 #include <components/to_utf8/to_utf8.hpp>
 

apps/opencs/model/tools/birthsigncheck.hpp

@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_BIRTHSIGNCHECK_H
 #define CSM_TOOLS_BIRTHSIGNCHECK_H
 
-#include <components/esm/loadbsgn.hpp>
+#include <components/esm3/loadbsgn.hpp>
 
 #include "../world/idcollection.hpp"
 #include "../world/resources.hpp"

apps/opencs/model/tools/bodypartcheck.hpp

@@ -1,8 +1,8 @@
 #ifndef CSM_TOOLS_BODYPARTCHECK_H
 #define CSM_TOOLS_BODYPARTCHECK_H
 
-#include <components/esm/loadbody.hpp>
-#include <components/esm/loadrace.hpp>
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadrace.hpp>
 
 #include "../world/resources.hpp"
 #include "../world/idcollection.hpp"

apps/opencs/model/tools/classcheck.cpp

@@ -2,8 +2,8 @@
 
 #include <map>
 
-#include <components/esm/loadclas.hpp>
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include "../prefs/state.hpp"
 

apps/opencs/model/tools/classcheck.hpp

@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_CLASSCHECK_H
 #define CSM_TOOLS_CLASSCHECK_H
 
-#include <components/esm/loadclas.hpp>
+#include <components/esm3/loadclas.hpp>
 
 #include "../world/idcollection.hpp"
 

apps/opencs/model/tools/enchantmentcheck.hpp

@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_ENCHANTMENTCHECK_H
 #define CSM_TOOLS_ENCHANTMENTCHECK_H
 
-#include <components/esm/loadench.hpp>
+#include <components/esm3/loadench.hpp>
 
 #include "../world/idcollection.hpp"
 

apps/opencs/model/tools/factioncheck.cpp

@@ -2,7 +2,7 @@
 
 #include <map>
 
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include "../prefs/state.hpp"
 

apps/opencs/model/tools/factioncheck.hpp

@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_FACTIONCHECK_H
 #define CSM_TOOLS_FACTIONCHECK_H
 
-#include <components/esm/loadfact.hpp>
+#include <components/esm3/loadfact.hpp>
 
 #include "../world/idcollection.hpp"
 

apps/opencs/model/tools/gmstcheck.hpp

@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_GMSTCHECK_H
 #define CSM_TOOLS_GMSTCHECK_H
 
-#include <components/esm/loadgmst.hpp>
+#include <components/esm3/loadgmst.hpp>
 
 #include "../world/idcollection.hpp"
 

apps/opencs/model/tools/journalcheck.hpp

@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_JOURNALCHECK_H
 #define CSM_TOOLS_JOURNALCHECK_H
 
-#include <components/esm/loaddial.hpp>
+#include <components/esm3/loaddial.hpp>
 
 #include "../world/idcollection.hpp"
 #include "../world/infocollection.hpp"

apps/opencs/model/tools/magiceffectcheck.hpp

@@ -1,8 +1,8 @@
 #ifndef CSM_TOOLS_MAGICEFFECTCHECK_HPP
 #define CSM_TOOLS_MAGICEFFECTCHECK_HPP
 
-#include <components/esm/loadmgef.hpp>
-#include <components/esm/loadsoun.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadsoun.hpp>
 
 #include "../world/idcollection.hpp"
 #include "../world/refidcollection.hpp"

apps/opencs/model/tools/racecheck.hpp

@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_RACECHECK_H
 #define CSM_TOOLS_RACECHECK_H
 
-#include <components/esm/loadrace.hpp>
+#include <components/esm3/loadrace.hpp>
 
 #include "../world/idcollection.hpp"
 

apps/opencs/model/tools/regioncheck.hpp

@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_REGIONCHECK_H
 #define CSM_TOOLS_REGIONCHECK_H
 
-#include <components/esm/loadregn.hpp>
+#include <components/esm3/loadregn.hpp>
 
 #include "../world/idcollection.hpp"
 

apps/opencs/model/tools/skillcheck.hpp

@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_SKILLCHECK_H
 #define CSM_TOOLS_SKILLCHECK_H
 
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include "../world/idcollection.hpp"
 

apps/opencs/model/tools/soundcheck.hpp

@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_SOUNDCHECK_H
 #define CSM_TOOLS_SOUNDCHECK_H
 
-#include <components/esm/loadsoun.hpp>
+#include <components/esm3/loadsoun.hpp>
 
 #include "../world/resources.hpp"
 #include "../world/idcollection.hpp"

apps/opencs/model/tools/spellcheck.cpp

@@ -3,7 +3,7 @@
 #include <sstream>
 #include <map>
 
-#include <components/esm/loadspel.hpp>
+#include <components/esm3/loadspel.hpp>
 
 #include "../prefs/state.hpp"
 

apps/opencs/model/tools/spellcheck.hpp

@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_SPELLCHECK_H
 #define CSM_TOOLS_SPELLCHECK_H
 
-#include <components/esm/loadspel.hpp>
+#include <components/esm3/loadspel.hpp>
 
 #include "../world/idcollection.hpp"
 

apps/opencs/model/tools/startscriptcheck.hpp

@@ -1,8 +1,8 @@
 #ifndef CSM_TOOLS_STARTSCRIPTCHECK_H
 #define CSM_TOOLS_STARTSCRIPTCHECK_H
 
-#include <components/esm/loadsscr.hpp>
-#include <components/esm/loadscpt.hpp>
+#include <components/esm3/loadsscr.hpp>
+#include <components/esm3/loadscpt.hpp>
 
 #include "../doc/stage.hpp"
 

apps/opencs/model/tools/topicinfocheck.hpp

@@ -3,13 +3,13 @@
 
 #include <set>
 
-#include <components/esm/loadclas.hpp>
-#include <components/esm/loaddial.hpp>
-#include <components/esm/loadfact.hpp>
-#include <components/esm/loadglob.hpp>
-#include <components/esm/loadgmst.hpp>
-#include <components/esm/loadrace.hpp>
-#include <components/esm/loadregn.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loaddial.hpp>
+#include <components/esm3/loadfact.hpp>
+#include <components/esm3/loadglob.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadregn.hpp>
 
 #include "../world/cell.hpp"
 #include "../world/idcollection.hpp"

apps/opencs/model/world/actoradapter.cpp

@@ -1,10 +1,10 @@
 #include "actoradapter.hpp"
 
-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadclot.hpp>
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/loadrace.hpp>
-#include <components/esm/mappings.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/mappings.hpp>
 #include <components/sceneutil/actorutil.hpp>
 
 #include "data.hpp"

apps/opencs/model/world/actoradapter.hpp

@@ -10,8 +10,8 @@
 #include <QObject>
 #include <QModelIndex>
 
-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadbody.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadbody.hpp>
 #include <components/misc/weakcache.hpp>
 
 #include "refidcollection.hpp"

apps/opencs/model/world/cell.hpp

@@ -4,7 +4,7 @@
 #include <vector>
 #include <string>
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 
 namespace CSMWorld
 {

apps/opencs/model/world/cellcoordinates.cpp

@@ -5,7 +5,7 @@
 #include <ostream>
 #include <sstream>
 
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/misc/constants.hpp>
 
 CSMWorld::CellCoordinates::CellCoordinates() : mX (0), mY (0) {}

apps/opencs/model/world/columnimp.hpp

@@ -9,9 +9,9 @@
 #include <QColor>
 #include <QVector>
 
-#include <components/esm/loadbody.hpp>
-#include <components/esm/loadskil.hpp>
-#include <components/esm/loadrace.hpp>
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadskil.hpp>
+#include <components/esm3/loadrace.hpp>
 
 #include "columnbase.hpp"
 #include "columns.hpp"

apps/opencs/model/world/columns.cpp

@@ -405,7 +405,7 @@ namespace
         "Combat", "Magic", "Stealth", 0
     };
 
-    // see ESM::Attribute::AttributeID in <component/esm/attr.hpp>
+    // see ESM::Attribute::AttributeID in <component/esm3/attr.hpp>
     static const char *sAttributes[] =
     {
         "Strength", "Intelligence", "Willpower", "Agility", "Speed", "Endurance", "Personality",
@@ -498,7 +498,7 @@ namespace
         "Alteration", "Conjuration", "Destruction", "Illusion", "Mysticism", "Restoration", 0
     };
 
-    // impact from magic effects, see ESM::Skill::SkillEnum in <component/esm/loadskil.hpp>
+    // impact from magic effects, see ESM::Skill::SkillEnum in <component/esm3/loadskil.hpp>
     static const char *sSkills[] =
     {
         "Block", "Armorer", "MediumArmor", "HeavyArmor", "BluntWeapon",
@@ -509,13 +509,13 @@ namespace
         "Speechcraft", "HandToHand", 0
     };
 
-    // range of magic effects, see ESM::RangeType in <component/esm/defs.hpp>
+    // range of magic effects, see ESM::RangeType in <component/esm3/defs.hpp>
     static const char *sEffectRange[] =
     {
         "Self", "Touch", "Target", 0
     };
 
-    // magic effect names, see ESM::MagicEffect::Effects in <component/esm/loadmgef.hpp>
+    // magic effect names, see ESM::MagicEffect::Effects in <component/esm3/loadmgef.hpp>
     static const char *sEffectId[] =
     {
         "WaterBreathing", "SwiftSwim", "WaterWalking", "Shield", "FireShield",
@@ -549,7 +549,7 @@ namespace
         "SummonBonewolf", "SummonCreature04", "SummonCreature05", 0
     };
 
-    // see ESM::PartReferenceType in <component/esm/loadarmo.hpp>
+    // see ESM::PartReferenceType in <component/esm3/loadarmo.hpp>
     static const char *sPartRefType[] =
     {
         "Head", "Hair", "Neck", "Cuirass", "Groin",
@@ -560,7 +560,7 @@ namespace
         "Weapon", "Tail", 0
     };
 
-    // see the enums in <component/esm/aipackage.hpp>
+    // see the enums in <component/esm3/aipackage.hpp>
     static const char *sAiPackageType[] =
     {
         "AI Wander", "AI Travel", "AI Follow", "AI Escort", "AI Activate", 0

apps/opencs/model/world/data.cpp

@@ -5,10 +5,10 @@
 
 #include <QAbstractItemModel>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 #include <components/esm/defs.hpp>
-#include <components/esm/loadglob.hpp>
-#include <components/esm/cellref.hpp>
+#include <components/esm3/loadglob.hpp>
+#include <components/esm3/cellref.hpp>
 
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/shadow.hpp>

apps/opencs/model/world/data.hpp

@@ -9,25 +9,25 @@
 #include <QObject>
 #include <QModelIndex>
 
-#include <components/esm/loadglob.hpp>
-#include <components/esm/loadgmst.hpp>
-#include <components/esm/loadskil.hpp>
-#include <components/esm/loadclas.hpp>
-#include <components/esm/loadfact.hpp>
-#include <components/esm/loadrace.hpp>
-#include <components/esm/loadsoun.hpp>
-#include <components/esm/loadscpt.hpp>
-#include <components/esm/loadregn.hpp>
-#include <components/esm/loadbsgn.hpp>
-#include <components/esm/loadspel.hpp>
-#include <components/esm/loaddial.hpp>
-#include <components/esm/loadench.hpp>
-#include <components/esm/loadbody.hpp>
-#include <components/esm/loadsndg.hpp>
-#include <components/esm/loadmgef.hpp>
-#include <components/esm/loadsscr.hpp>
-#include <components/esm/debugprofile.hpp>
-#include <components/esm/filter.hpp>
+#include <components/esm3/loadglob.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadskil.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadfact.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadsoun.hpp>
+#include <components/esm3/loadscpt.hpp>
+#include <components/esm3/loadregn.hpp>
+#include <components/esm3/loadbsgn.hpp>
+#include <components/esm3/loadspel.hpp>
+#include <components/esm3/loaddial.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadsndg.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadsscr.hpp>
+#include <components/esm3/debugprofile.hpp>
+#include <components/esm3/filter.hpp>
 
 #include <components/resource/resourcesystem.hpp>
 

apps/opencs/model/world/idcollection.hpp

@@ -1,7 +1,7 @@
 #ifndef CSM_WOLRD_IDCOLLECTION_H
 #define CSM_WOLRD_IDCOLLECTION_H
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 #include "collection.hpp"
 #include "land.hpp"

apps/opencs/model/world/idtable.cpp

@@ -7,7 +7,7 @@
 #include <map>
 #include <stdexcept>
 
-#include <components/esm/cellid.hpp>
+#include <components/esm3/cellid.hpp>
 #include <components/misc/stringops.hpp>
 
 #include "collectionbase.hpp"

apps/opencs/model/world/info.hpp

@@ -1,7 +1,7 @@
 #ifndef CSM_WOLRD_INFO_H
 #define CSM_WOLRD_INFO_H
 
-#include <components/esm/loadinfo.hpp>
+#include <components/esm3/loadinfo.hpp>
 
 namespace CSMWorld
 {

apps/opencs/model/world/infocollection.cpp

@@ -4,8 +4,8 @@
 #include <iterator>
 #include <cassert>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/loaddial.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/loaddial.hpp>
 
 #include <components/misc/stringops.hpp>
 

apps/opencs/model/world/infoselectwrapper.hpp

@@ -1,7 +1,7 @@
 #ifndef CSM_WORLD_INFOSELECTWRAPPER_H
 #define CSM_WORLD_INFOSELECTWRAPPER_H
 
-#include <components/esm/loadinfo.hpp>
+#include <components/esm3/loadinfo.hpp>
 
 namespace CSMWorld
 {

apps/opencs/model/world/land.hpp

@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 
 namespace CSMWorld
 {

apps/opencs/model/world/landtexture.cpp

@@ -3,7 +3,7 @@
 #include <sstream>
 #include <stdexcept>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace CSMWorld
 {

apps/opencs/model/world/landtexture.hpp

@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include <components/esm/loadltex.hpp>
+#include <components/esm3/loadltex.hpp>
 
 namespace CSMWorld
 {

apps/opencs/model/world/metadata.cpp

@@ -1,8 +1,8 @@
 #include "metadata.hpp"
 
-#include <components/esm/loadtes3.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/loadtes3.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 void CSMWorld::MetaData::blank()
 {

apps/opencs/model/world/nestedcoladapterimp.cpp

@@ -1,7 +1,7 @@
 #include "nestedcoladapterimp.hpp"
 
-#include <components/esm/loadregn.hpp>
-#include <components/esm/loadfact.hpp>
+#include <components/esm3/loadregn.hpp>
+#include <components/esm3/loadfact.hpp>
 
 #include "idcollection.hpp"
 #include "pathgrid.hpp"

apps/opencs/model/world/nestedcoladapterimp.hpp

@@ -3,12 +3,12 @@
 
 #include <QVariant>
 
-#include <components/esm/loadpgrd.hpp>
-#include <components/esm/effectlist.hpp>
-#include <components/esm/loadmgef.hpp> // for converting magic effect id to string & back
-#include <components/esm/loadskil.hpp> // for converting skill names
+#include <components/esm3/loadpgrd.hpp>
+#include <components/esm3/effectlist.hpp>
+#include <components/esm3/loadmgef.hpp> // for converting magic effect id to string & back
+#include <components/esm3/loadskil.hpp> // for converting skill names
 #include <components/esm/attr.hpp>     // for converting attributes
-#include <components/esm/loadrace.hpp>
+#include <components/esm3/loadrace.hpp>
 
 #include "nestedcolumnadapter.hpp"
 #include "nestedtablewrapper.hpp"

apps/opencs/model/world/pathgrid.hpp

@@ -4,7 +4,7 @@
 #include <vector>
 #include <string>
 
-#include <components/esm/loadpgrd.hpp>
+#include <components/esm3/loadpgrd.hpp>
 
 namespace CSMWorld
 {

apps/opencs/model/world/ref.hpp

@@ -3,7 +3,7 @@
 
 #include <utility>
 
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 
 namespace CSMWorld
 {

apps/opencs/model/world/refcollection.cpp

@@ -1,6 +1,6 @@
 #include "refcollection.hpp"
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include "ref.hpp"
 #include "cell.hpp"

apps/opencs/model/world/refidadapterimp.cpp

@@ -4,8 +4,8 @@
 #include <stdexcept>
 #include <utility>
 
-#include <components/esm/loadcont.hpp>
-#include <components/esm/loadmgef.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 #include "nestedtablewrapper.hpp"
 

apps/opencs/model/world/refidadapterimp.hpp

@@ -5,11 +5,11 @@
 
 #include <QVariant>
 
-#include <components/esm/loadalch.hpp>
-#include <components/esm/loadench.hpp>
-#include <components/esm/loadappa.hpp>
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/loadcrea.hpp>
+#include <components/esm3/loadalch.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadappa.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadcrea.hpp>
 
 #include "columnbase.hpp"
 #include "record.hpp"

apps/opencs/model/world/refidcollection.cpp

@@ -4,7 +4,7 @@
 #include <memory>
 #include <string_view>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 #include "refidadapter.hpp"
 #include "refidadapterimp.hpp"

apps/opencs/model/world/refiddata.hpp

@@ -7,26 +7,26 @@
 #include <cassert>
 #include <string_view>
 
-#include <components/esm/loadacti.hpp>
-#include <components/esm/loadalch.hpp>
-#include <components/esm/loadappa.hpp>
-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadbook.hpp>
-#include <components/esm/loadclot.hpp>
-#include <components/esm/loadcont.hpp>
-#include <components/esm/loadcrea.hpp>
-#include <components/esm/loaddoor.hpp>
-#include <components/esm/loadingr.hpp>
-#include <components/esm/loadlevlist.hpp>
-#include <components/esm/loadligh.hpp>
-#include <components/esm/loadlock.hpp>
-#include <components/esm/loadprob.hpp>
-#include <components/esm/loadrepa.hpp>
-#include <components/esm/loadstat.hpp>
-#include <components/esm/loadweap.hpp>
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/loadmisc.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/loadacti.hpp>
+#include <components/esm3/loadalch.hpp>
+#include <components/esm3/loadappa.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadbook.hpp>
+#include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loaddoor.hpp>
+#include <components/esm3/loadingr.hpp>
+#include <components/esm3/loadlevlist.hpp>
+#include <components/esm3/loadligh.hpp>
+#include <components/esm3/loadlock.hpp>
+#include <components/esm3/loadprob.hpp>
+#include <components/esm3/loadrepa.hpp>
+#include <components/esm3/loadstat.hpp>
+#include <components/esm3/loadweap.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadmisc.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 #include <components/misc/stringops.hpp>
 

apps/opencs/view/render/actor.cpp

@@ -3,7 +3,7 @@
 #include <osg/Group>
 #include <osg/Node>
 
-#include <components/esm/mappings.hpp>
+#include <components/esm3/mappings.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcemanager.hpp>
 #include <components/resource/scenemanager.hpp>

apps/opencs/view/render/actor.hpp

@@ -8,7 +8,7 @@
 
 #include <QObject>
 
-#include <components/esm/loadarmo.hpp>
+#include <components/esm3/loadarmo.hpp>
 #include <components/sceneutil/visitor.hpp>
 
 #include "../../model/world/actoradapter.hpp"

apps/opencs/view/render/brushdraw.hpp

@@ -4,7 +4,7 @@
 #include <osg/Group>
 #include <osg/Geometry>
 
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include "../widget/brushshapes.hpp"
 
 namespace CSVRender

apps/opencs/view/render/cell.cpp

@@ -8,8 +8,8 @@
 #include <osg/Group>
 
 #include <components/misc/stringops.hpp>
-#include <components/esm/loadcell.hpp>
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/sceneutil/pathgridutil.hpp>
 #include <components/terrain/terraingrid.hpp>
 

apps/opencs/view/render/cellborder.cpp

@@ -5,7 +5,7 @@
 #include <osg/Geometry>
 #include <osg/PrimitiveSet>
 
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 
 #include "mask.hpp"
 

apps/opencs/view/render/cellwater.cpp

@@ -5,7 +5,7 @@
 #include <osg/Group>
 #include <osg/PositionAttitudeTransform>
 
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/fallback/fallback.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/resource/imagemanager.hpp>