Refactor|libheretic: Renamed HereticV13GameStateReader as HereticV13M…

…apStateReader
skyjake · Mar 11, 2014 · 5c8ea1a · 5c8ea1a
1 parent 838165f
commit 5c8ea1a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 20 deletions.
diff --git a/doomsday/plugins/heretic/heretic.pro b/doomsday/plugins/heretic/heretic.pro
@@ -46,7 +46,7 @@ HEADERS += \
     include/h_stat.h \
     include/h_think.h \
     include/h_type.h \
-    include/hereticv13gamestatereader.h \
+    include/hereticv13mapstatereader.h \
     include/in_lude.h \
     include/info.h \
     include/jheretic.h \
@@ -76,7 +76,7 @@ SOURCES += \
     src/h_console.c \
     src/h_main.cpp \
     src/h_refresh.cpp \
-    src/hereticv13gamestatereader.cpp \
+    src/hereticv13mapstatereader.cpp \
     src/in_lude.cpp \
     src/m_cheat.cpp \
     src/m_random.c \

diff --git a/...retic/include/hereticv13gamestatereader.h → ...eretic/include/hereticv13mapstatereader.h b/...retic/include/hereticv13gamestatereader.h → ...eretic/include/hereticv13mapstatereader.h
@@ -1,4 +1,4 @@
-/** @file hereticv13gamestatereader.h  Heretic ver 1.3 saved game map state reader.
+/** @file hereticv13mapstatereader.h  Heretic ver 1.3 saved game map state reader.
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
  * @authors Copyright © 2006-2013 Daniel Swanson <danij@dengine.net>
@@ -19,8 +19,8 @@
  * 02110-1301 USA</small>
  */
 
-#ifndef LIBHERETIC_HERETICV13_GAMESTATEREADER
-#define LIBHERETIC_HERETICV13_GAMESTATEREADER
+#ifndef LIBHERETIC_HERETICV13_MAPSTATEREADER
+#define LIBHERETIC_HERETICV13_MAPSTATEREADER
 
 #ifndef __JHERETIC__
 #  error "Using jHeretic headers without __JHERETIC__"
@@ -33,19 +33,18 @@
  *
  * @ingroup libheretic
  */
-class HereticV13GameStateReader : public de::game::IMapStateReader
+class HereticV13MapStateReader : public de::game::IMapStateReader
 {
 public:
-    HereticV13GameStateReader();
-    ~HereticV13GameStateReader();
+    HereticV13MapStateReader();
+    ~HereticV13MapStateReader();
 
     static de::game::IMapStateReader *make();
-    //static bool recognize(de::Path const &stateFilePath, de::game::SessionMetadata &metadata);
 
     void read(de::Path const &filePath, de::game::SessionMetadata const &metadata);
 
 private:
     DENG2_PRIVATE(d)
 };
 
-#endif // LIBHERETIC_HERETICV13_GAMESTATEREADER
+#endif // LIBHERETIC_HERETICV13_MAPSTATEREADER
diff --git a/doomsday/plugins/heretic/src/h_main.cpp b/doomsday/plugins/heretic/src/h_main.cpp
@@ -26,7 +26,7 @@
 #include "m_argv.h"
 #include "p_map.h"
 #include "p_saveg.h"
-#include "hereticv13gamestatereader.h"
+#include "hereticv13mapstatereader.h"
 #include "am_map.h"
 #include "g_defs.h"
 #include "p_inventory.h"
@@ -320,7 +320,7 @@ void H_PreInit()
 
     // Declare the Heretic V13 game state reader/interpreter.
     de::game::SavedSessionRepository &saveRepo = G_SavedSessionRepository();
-    saveRepo.declareReader("HereticV13", &HereticV13GameStateReader::make);
+    saveRepo.declareReader("HereticV13", &HereticV13MapStateReader::make);
 }
 
 void H_PostInit()

diff --git a/...heretic/src/hereticv13gamestatereader.cpp → .../heretic/src/hereticv13mapstatereader.cpp b/...heretic/src/hereticv13gamestatereader.cpp → .../heretic/src/hereticv13mapstatereader.cpp
@@ -1,4 +1,4 @@
-/** @file hereticv13gamestatereader.cpp  Heretic ver 1.3 save game reader.
+/** @file hereticv13mapstatereader.cpp  Heretic ver 1.3 save game reader.
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
  * @authors Copyright © 2006-2013 Daniel Swanson <danij@dengine.net>
@@ -20,7 +20,7 @@
  */
 
 #include "jheretic.h"
-#include "hereticv13gamestatereader.h"
+#include "hereticv13mapstatereader.h"
 
 #include "am_map.h"
 #include "dmu_lib.h"
@@ -656,7 +656,7 @@ static Reader *SV_NewReader_Hr_v13()
     return Reader_NewWithCallbacks(sri8, sri16, sri32, NULL, srd);
 }
 
-DENG2_PIMPL(HereticV13GameStateReader)
+DENG2_PIMPL(HereticV13MapStateReader)
 {
     Reader *reader;
 
@@ -801,18 +801,18 @@ DENG2_PIMPL(HereticV13GameStateReader)
     }
 };
 
-HereticV13GameStateReader::HereticV13GameStateReader() : d(new Instance(this))
+HereticV13MapStateReader::HereticV13MapStateReader() : d(new Instance(this))
 {}
 
-HereticV13GameStateReader::~HereticV13GameStateReader()
+HereticV13MapStateReader::~HereticV13MapStateReader()
 {}
 
-de::game::IMapStateReader *HereticV13GameStateReader::make()
+de::game::IMapStateReader *HereticV13MapStateReader::make()
 {
-    return new HereticV13GameStateReader;
+    return new HereticV13MapStateReader;
 }
 
-void HereticV13GameStateReader::read(de::Path const &filePath, de::game::SessionMetadata const &metadata)
+void HereticV13MapStateReader::read(de::Path const &filePath, de::game::SessionMetadata const &metadata)
 {
     if(!SV_OpenFile_Hr_v13(filePath))
     {