remove underscores from filenames in esm

apps/esmtool/esmtool.cpp

@@ -4,8 +4,8 @@
 
 #include <boost/program_options.hpp>
 
-#include <components/esm/esm_reader.hpp>
-#include <components/esm/esm_writer.hpp>
+#include <components/esm/esmreader.hpp>
+#include <components/esm/esmwriter.hpp>
 #include <components/esm/records.hpp>
 
 #define ESMTOOL_VERSION 1.1

apps/launcher/datafilespage.cpp

@@ -1,6 +1,6 @@
 #include <QtGui>
 
-#include <components/esm/esm_reader.hpp>
+#include <components/esm/esmreader.hpp>
 #include <components/files/configurationmanager.hpp>
 
 #include "datafilespage.hpp"

components/CMakeLists.txt

@@ -39,7 +39,7 @@ add_component_dir (esm_store
     )
 
 add_component_dir (esm
-    attr defs esm_reader esm_writer loadacti loadalch loadappa loadarmo loadbody loadbook loadbsgn loadcell
+    attr defs esmcommon esmreader esmwriter loadacti loadalch loadappa loadarmo loadbody loadbook loadbsgn loadcell
     loadclas loadclot loadcont loadcrea loadcrec loaddial loaddoor loadench loadfact loadglob loadgmst
     loadinfo loadingr loadland loadlevlist loadligh loadlocks loadltex loadmgef loadmisc loadnpcc
     loadnpc loadpgrd loadrace loadregn loadscpt loadskil loadsndg loadsoun loadspel loadsscr loadstat

components/esm/aipackage.cpp

@@ -1,7 +1,7 @@
 #include "aipackage.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/aipackage.hpp

@@ -4,7 +4,7 @@
 #include <vector>
 #include <string>
 
-#include "esm_common.hpp"
+#include "esmcommon.hpp"
 
 namespace ESM
 {

components/esm/effectlist.cpp

@@ -1,7 +1,7 @@
 #include "effectlist.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM {
 

components/esm/esmreader.cpp

@@ -1,4 +1,4 @@
-#include "esm_reader.hpp"
+#include "esmreader.hpp"
 #include <stdexcept>
 
 namespace ESM

components/esm/esmreader.hpp

@@ -12,7 +12,7 @@
 #include <components/misc/stringops.hpp>
 
 #include <components/to_utf8/to_utf8.hpp>
-#include "esm_common.hpp"
+#include "esmcommon.hpp"
 
 namespace ESM {
 

components/esm/esmwriter.cpp

@@ -1,4 +1,4 @@
-#include "esm_writer.hpp"
+#include "esmwriter.hpp"
 #include <fstream>
 #include <cstring>
 

components/esm/esmwriter.hpp

@@ -5,7 +5,7 @@
 #include <list>
 #include <assert.h>
 
-#include "esm_common.hpp"
+#include "esmcommon.hpp"
 #include "../to_utf8/to_utf8.hpp"
 
 namespace ESM {

components/esm/loadacti.cpp

@@ -1,7 +1,7 @@
 #include "loadacti.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadalch.cpp

@@ -1,7 +1,7 @@
 #include "loadalch.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadappa.cpp

@@ -1,7 +1,7 @@
 #include "loadappa.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadarmo.cpp

@@ -1,7 +1,7 @@
 #include "loadarmo.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadbody.cpp

@@ -1,7 +1,7 @@
 #include "loadbody.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadbook.cpp

@@ -1,7 +1,7 @@
 #include "loadbook.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadbsgn.cpp

@@ -1,7 +1,7 @@
 #include "loadbsgn.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadcell.cpp

@@ -3,8 +3,8 @@
 #include <string>
 #include <sstream>
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadcell.hpp

@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "esm_common.hpp"
+#include "esmcommon.hpp"
 #include "record.hpp"
 #include "defs.hpp"
 

components/esm/loadclas.cpp

@@ -1,7 +1,7 @@
 #include "loadclas.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadclot.cpp

@@ -1,7 +1,7 @@
 #include "loadclot.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadcont.cpp

@@ -1,7 +1,7 @@
 #include "loadcont.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadcont.hpp

@@ -5,7 +5,7 @@
 #include <vector>
 
 #include "record.hpp"
-#include "esm_common.hpp"
+#include "esmcommon.hpp"
 
 namespace ESM
 {

components/esm/loadcrea.cpp

@@ -1,7 +1,7 @@
 #include "loadcrea.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM {
 

components/esm/loadcrec.hpp

@@ -4,7 +4,7 @@
 #include "record.hpp"
 
 // TODO create implementation files and remove this one
-#include "esm_reader.hpp"
+#include "esmreader.hpp"
 
 namespace ESM {
 

components/esm/loaddial.cpp

@@ -1,7 +1,7 @@
 #include "loaddial.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loaddoor.cpp

@@ -1,7 +1,7 @@
 #include "loaddoor.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadench.cpp

@@ -1,7 +1,7 @@
 #include "loadench.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadfact.cpp

@@ -1,7 +1,7 @@
 #include "loadfact.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadglob.cpp

@@ -1,7 +1,7 @@
 #include "loadglob.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadgmst.cpp

@@ -2,8 +2,8 @@
 
 #include <stdexcept>
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadinfo.cpp

@@ -1,7 +1,7 @@
 #include "loadinfo.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadingr.cpp

@@ -1,7 +1,7 @@
 #include "loadingr.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadland.cpp

@@ -1,7 +1,7 @@
 #include "loadland.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadland.hpp

@@ -4,7 +4,7 @@
 #include <libs/platform/stdint.h>
 
 #include "record.hpp"
-#include "esm_common.hpp"
+#include "esmcommon.hpp"
 
 namespace ESM
 {

components/esm/loadlevlist.cpp

@@ -1,7 +1,7 @@
 #include "loadlevlist.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadligh.cpp

@@ -1,7 +1,7 @@
 #include "loadligh.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadlocks.cpp

@@ -1,7 +1,7 @@
 #include "loadlocks.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadltex.cpp

@@ -1,7 +1,7 @@
 #include "loadltex.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadmgef.cpp

@@ -1,7 +1,7 @@
 #include "loadmgef.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace
 {

components/esm/loadmisc.cpp

@@ -1,7 +1,7 @@
 #include "loadmisc.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadnpc.cpp

@@ -1,7 +1,7 @@
 #include "loadnpc.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadnpcc.hpp

@@ -4,7 +4,7 @@
 #include "record.hpp"
 
 // TODO: create implementation files to remove this
-#include "esm_reader.hpp"
+#include "esmreader.hpp"
 
 namespace ESM {
 

components/esm/loadpgrd.cpp

@@ -1,7 +1,7 @@
 #include "loadpgrd.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadrace.cpp

@@ -1,7 +1,7 @@
 #include "loadrace.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadregn.cpp

@@ -1,7 +1,7 @@
 #include "loadregn.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadregn.hpp

@@ -5,7 +5,7 @@
 #include <vector>
 
 #include "record.hpp"
-#include "esm_common.hpp"
+#include "esmcommon.hpp"
 
 namespace ESM
 {

components/esm/loadscpt.cpp

@@ -1,7 +1,7 @@
 #include "loadscpt.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadscpt.hpp

@@ -5,7 +5,7 @@
 #include <vector>
 
 #include "record.hpp"
-#include "esm_common.hpp"
+#include "esmcommon.hpp"
 
 namespace ESM
 {

components/esm/loadskil.cpp

@@ -1,7 +1,7 @@
 #include "loadskil.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadsndg.cpp

@@ -1,7 +1,7 @@
 #include "loadsndg.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadsoun.cpp

@@ -1,7 +1,7 @@
 #include "loadsoun.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadspel.cpp

@@ -1,7 +1,7 @@
 #include "loadspel.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadsscr.cpp

@@ -1,7 +1,7 @@
 #include "loadsscr.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadstat.cpp

@@ -1,7 +1,7 @@
 #include "loadstat.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/loadweap.cpp

@@ -1,7 +1,7 @@
 #include "loadweap.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM
 {

components/esm/spelllist.cpp

@@ -1,7 +1,7 @@
 #include "spelllist.hpp"
 
-#include "esm_reader.hpp"
-#include "esm_writer.hpp"
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
 
 namespace ESM {
 

components/terrain/esm_land_factory.cpp

@@ -3,7 +3,7 @@
 // The first one already includes the others implicitly, but it
 // doesn't hurt to be explicit.
 #include "../esm_store/store.hpp"
-#include "../esm/esm_reader.hpp"
+#include "../esm/esmreader.hpp"
 #include "../esm/loadland.hpp"
 
 using namespace Terrain;