Renamed Subfile to SubFile in SubDirectory class

include/SubDirectory.h

@@ -10,7 +10,7 @@
 #include <queue>
 #include <unordered_map>
 #include <unordered_set>
-#include "Subfile.h"
+#include "SubFile.h"
 
 
 extern "C++"
@@ -20,7 +20,7 @@ namespace LOTRO_DAT
     enum FILE_TYPE : int;
     class DatFile;
     class BinaryData;
-    class Subfile;
+    class SubFile;
 
     class SubDirectory
     {
@@ -38,7 +38,7 @@ namespace LOTRO_DAT
 
         SubDirectory(long long offset, DatFile &dat, long long max_subdirs = 63);
         ~SubDirectory();
-        void MakeDictionary(std::map<long long, std::shared_ptr<Subfile>> &dict);
+        void MakeDictionary(std::map<long long, std::shared_ptr<SubFile>> &dict);
 
         bool MakeSubDirectories();
         bool MakeSubFiles();
@@ -49,7 +49,7 @@ namespace LOTRO_DAT
         static std::set<std::shared_ptr<SubDirectory>, SubDirectoryOffsetComp> subfile_init_queue_;
 
     private:
-        std::shared_ptr<Subfile> MakeSubfile(long long dictionary_offset, long long unknown1, long long file_id, long long file_offset,
+        std::shared_ptr<SubFile> MakeSubfile(long long dictionary_offset, long long unknown1, long long file_id, long long file_offset,
                              long long file_size, long long timestamp, long long version, long long block_size, long long unknown2);
 
         FILE_TYPE GetSubfileType(long long file_id, long long file_offset) const;
@@ -58,7 +58,7 @@ namespace LOTRO_DAT
         long long max_subdirs_;
 
         std::vector<std::shared_ptr<SubDirectory>> subdirs_;
-        std::vector<std::shared_ptr<Subfile>> subfiles_;
+        std::vector<std::shared_ptr<SubFile>> subfiles_;
     };
 }
 };

src/SubDirectory.cpp

@@ -4,7 +4,7 @@
 #include "SubDirectory.h"
 
 #include "DatFile.h"
-#include "Subfile.h"
+#include "SubFile.h"
 #include "BinaryData.h"
 #include "EasyLogging++/easylogging++.h"
 
@@ -121,7 +121,7 @@ namespace LOTRO_DAT {
             if (dat_.CorrectSubfile(subfiles_[i])) {
                 visited_subfiles_.insert(subfiles_[i]->file_id());
             } else {
-                LOG(WARNING) << "Incorrect Subfile in directory at offset " << offset_ + 63 * 8 + 4 + 32 * i << " (id = " << subfiles_[i]->file_id() << ");";
+                LOG(WARNING) << "Incorrect SubFile in directory at offset " << offset_ + 63 * 8 + 4 + 32 * i << " (id = " << subfiles_[i]->file_id() << ");";
                 delete subfiles_[i];
                 subfiles_[i] = nullptr;
                 break;
@@ -130,8 +130,8 @@ namespace LOTRO_DAT {
         return true;
     }
 
-    void SubDirectory::MakeDictionary(std::map<long long, std::shared_ptr<Subfile> > &dict) {
-        for (const std::shared_ptr<Subfile> &file: subfiles_) {
+    void SubDirectory::MakeDictionary(std::map<long long, std::shared_ptr<SubFile> > &dict) {
+        for (const std::shared_ptr<SubFile> &file: subfiles_) {
             if (dict.count(file->file_id() != 0)) {
                 LOG(WARNING) << "Found multiple instances of file " << file->file_id() << " at dictionary offset "
                              << file->dictionary_offset() << ". Base offset = " << dict[file->file_id()]->dictionary_offset();
@@ -146,7 +146,7 @@ namespace LOTRO_DAT {
         }
     }
 
-    std::shared_ptr<Subfile> SubDirectory::MakeSubfile(long long dictionary_offset, long long unknown1, long long file_id,
+    std::shared_ptr<SubFile> SubDirectory::MakeSubfile(long long dictionary_offset, long long unknown1, long long file_id,
                                        long long file_offset, long long file_size, long long timestamp,
                                        long long version, long long block_size, long long unknown2) {
 
@@ -154,22 +154,22 @@ namespace LOTRO_DAT {
 
         switch (type) {
             case TEXT:
-                return std::dynamic_pointer_cast<Subfile>(std::make_shared<TextSubfile>(dat_, dictionary_offset, unknown1, file_id, file_offset, file_size, timestamp, version, block_size, unknown2));
+                return std::dynamic_pointer_cast<SubFile>(std::make_shared<TextSubfile>(dat_, dictionary_offset, unknown1, file_id, file_offset, file_size, timestamp, version, block_size, unknown2));
             case JPG:
-                return std::dynamic_pointer_cast<Subfile>(std::make_shared<JpgSubfile>(dat_, dictionary_offset, unknown1, file_id, file_offset, file_size, timestamp, version, block_size, unknown2));
+                return std::dynamic_pointer_cast<SubFile>(std::make_shared<JpgSubfile>(dat_, dictionary_offset, unknown1, file_id, file_offset, file_size, timestamp, version, block_size, unknown2));
             case DDS:
-                return std::dynamic_pointer_cast<Subfile>(std::make_shared<DdsSubfile>(dat_, dictionary_offset, unknown1, file_id, file_offset, file_size, timestamp, version, block_size, unknown2));
+                return std::dynamic_pointer_cast<SubFile>(std::make_shared<DdsSubfile>(dat_, dictionary_offset, unknown1, file_id, file_offset, file_size, timestamp, version, block_size, unknown2));
             case WAV:
-                return std::dynamic_pointer_cast<Subfile>(std::make_shared<WavSubfile>(dat_, dictionary_offset, unknown1, file_id, file_offset, file_size, timestamp, version, block_size, unknown2));
+                return std::dynamic_pointer_cast<SubFile>(std::make_shared<WavSubfile>(dat_, dictionary_offset, unknown1, file_id, file_offset, file_size, timestamp, version, block_size, unknown2));
             case OGG:
-                return std::dynamic_pointer_cast<Subfile>(std::make_shared<OggSubfile>(dat_, dictionary_offset, unknown1, file_id, file_offset, file_size, timestamp, version, block_size, unknown2));
+                return std::dynamic_pointer_cast<SubFile>(std::make_shared<OggSubfile>(dat_, dictionary_offset, unknown1, file_id, file_offset, file_size, timestamp, version, block_size, unknown2));
             case FONT:
-                return std::dynamic_pointer_cast<Subfile>(std::make_shared<FontSubfile>(dat_, dictionary_offset, unknown1, file_id, file_offset, file_size, timestamp, version, block_size, unknown2));
+                return std::dynamic_pointer_cast<SubFile>(std::make_shared<FontSubfile>(dat_, dictionary_offset, unknown1, file_id, file_offset, file_size, timestamp, version, block_size, unknown2));
             case UNKNOWN:
-                return std::dynamic_pointer_cast<Subfile>(std::make_shared<UnknownSubfile>(dat_, dictionary_offset, unknown1, file_id, file_offset, file_size, timestamp, version, block_size, unknown2));
+                return std::dynamic_pointer_cast<SubFile>(std::make_shared<UnknownSubfile>(dat_, dictionary_offset, unknown1, file_id, file_offset, file_size, timestamp, version, block_size, unknown2));
         }
         LOG(ERROR) << "Incorrect file type..";
-        return std::dynamic_pointer_cast<Subfile>(std::make_shared<UnknownSubfile>(dat_, dictionary_offset, unknown1, file_id, file_offset, file_size, timestamp, version, block_size, unknown2));
+        return std::dynamic_pointer_cast<SubFile>(std::make_shared<UnknownSubfile>(dat_, dictionary_offset, unknown1, file_id, file_offset, file_size, timestamp, version, block_size, unknown2));
     }
 
     FILE_TYPE SubDirectory::GetSubfileType(long long file_id, long long file_offset) const {