Refactored and renamed *Subfile to *SubFile class

include/Subfiles/DdsSubfile.h → include/Subfiles/DdsSubFile.h

@@ -5,14 +5,16 @@
 #ifndef LOTRO_DAT_LIBRARY_DDSSUBFILE_H
 #define LOTRO_DAT_LIBRARY_DDSSUBFILE_H
 
-#include "../../include/Subfile.h"
+#include "SubFile.h"
 
 namespace LOTRO_DAT {
-    class DdsSubfile : public Subfile {
+    class DdsSubFile : public SubFile {
     public:
-        DdsSubfile();
+        DdsSubFile() = delete;
+        explicit DdsSubFile(const DdsSubFile &other) = delete;
+        DdsSubFile &operator =(const DdsSubFile &other) = delete;
 
-        DdsSubfile(DatFile *dat, long long dictionary_offset, long long fragments_count, long long unknown1,
+        DdsSubFile(DatFile &dat, long long dictionary_offset, long long fragments_count, 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);
 

include/Subfiles/FontSubfile.h → include/Subfiles/FontSubFile.h

@@ -6,13 +6,16 @@
 #define LOTRO_DAT_LIBRARY_FONTSUBFILE_H
 
 
-#include "../../include/Subfile.h"
+#include "SubFile.h"
 
 namespace LOTRO_DAT {
-    class FontSubfile : public Subfile {
+    class FontSubFile : public SubFile {
     public:
-        FontSubfile();
-        FontSubfile(DatFile *dat, long long dictionary_offset, long long fragments_count, long long unknown1,
+        FontSubFile() = delete;
+        explicit FontSubFile(const FontSubFile &other) = delete;
+        FontSubFile &operator =(const FontSubFile &other) = delete;
+
+        FontSubFile(DatFile &dat, long long dictionary_offset, long long fragments_count, 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);
 

include/Subfiles/JpgSubfile.h → include/Subfiles/JpgSubFile.h

@@ -6,14 +6,16 @@
 #define LOTRO_DAT_LIBRARY_JPGSUBFILE_H
 
 
-#include "../../include/Subfile.h"
+#include "SubFile.h"
 
 namespace LOTRO_DAT {
-    class JpgSubfile : public Subfile {
+    class JpgSubFile : public SubFile {
     public:
-        JpgSubfile();
+        JpgSubFile() = delete;
+        explicit JpgSubFile(const JpgSubFile &other) = delete;
+        JpgSubFile &operator =(const JpgSubFile &other) = delete;
 
-        JpgSubfile(DatFile *dat, long long dictionary_offset, long long fragments_count, long long unknown1,
+        JpgSubFile(DatFile &dat, long long dictionary_offset, long long fragments_count, 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);
 

include/Subfiles/OggSubfile.h → include/Subfiles/OggSubFile.h

@@ -5,14 +5,16 @@
 #ifndef LOTRO_DAT_LIBRARY_OGGSUBFILE_H
 #define LOTRO_DAT_LIBRARY_OGGSUBFILE_H
 
-#include "../../include/Subfile.h"
+#include "SubFile.h"
 
 namespace LOTRO_DAT {
-    class OggSubfile : public Subfile {
+    class OggSubFile : public SubFile {
     public:
-        OggSubfile();
+        OggSubFile() = delete;
+        explicit OggSubFile(const OggSubFile &other) = delete;
+        OggSubFile &operator =(const OggSubFile &other) = delete;
 
-        OggSubfile(DatFile *dat, long long dictionary_offset,  long long fragments_count, long long unknown1,
+        OggSubFile(DatFile &dat, long long dictionary_offset,  long long fragments_count, 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);
 

include/Subfiles/TextSubfile.h → include/Subfiles/TextSubFile.h

@@ -5,16 +5,19 @@
 #ifndef LOTRO_DAT_LIBRARY_TEXTSUBFILE_H
 #define LOTRO_DAT_LIBRARY_TEXTSUBFILE_H
 
-#include "../../include/Subfile.h"
+#include "SubFile.h"
 #include <vector>
 #include <unordered_map>
 
 namespace LOTRO_DAT {
-    class TextSubfile : public Subfile {
+    class TextSubFile : public SubFile {
     public:
-        TextSubfile();
+        TextSubFile() = delete;
+        explicit TextSubFile(const TextSubFile &other) = delete;
+        SubFile &operator =(const TextSubFile &other) = delete;
 
-        TextSubfile(DatFile *dat, long long dictionary_offset, long long fragments_count, long long unknown1,
+
+        TextSubFile(DatFile &dat, long long dictionary_offset, long long fragments_count, 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);
 
@@ -26,6 +29,9 @@ namespace LOTRO_DAT {
 
         BinaryData MakeForImport(const BinaryData &old_data, const SubfileData &data) override;
 
+    private:
+        std::vector<SubfileData> FileFragments;
+
     private:
         std::vector<std::u16string> MakePieces(const BinaryData &data, long long &offset);
 
@@ -33,8 +39,6 @@ namespace LOTRO_DAT {
 
         std::vector<std::vector<BinaryData>> MakeArgumentStrings(const BinaryData &data, long long &offset);
 
-        std::vector<SubfileData> FileFragments;
-
         std::unordered_map<long long, SubfileData> ParsePatchFragments(const SubfileData &data);
 
         BinaryData BuildPieces(const BinaryData &data, const SubfileData &new_data, long long &offset);

include/Subfiles/UnknownSubfile.h → include/Subfiles/UnknownSubFile.h

@@ -5,14 +5,16 @@
 #ifndef LOTRO_DAT_LIBRARY_UNKNOWNSUBFILE_H
 #define LOTRO_DAT_LIBRARY_UNKNOWNSUBFILE_H
 
-#include "Subfile.h"
+#include "SubFile.h"
 
 namespace LOTRO_DAT {
-    class UnknownSubfile : public Subfile {
+    class UnknownSubFile : public SubFile {
     public:
-        UnknownSubfile();
+        UnknownSubFile() = delete;
+        explicit UnknownSubFile(const UnknownSubFile &other) = delete;
+        SubFile &operator =(const UnknownSubFile &other) = delete;
 
-        UnknownSubfile(DatFile *dat, long long dictionary_offset, long long fragments_count, long long unknown1,
+        UnknownSubFile(DatFile &dat, long long dictionary_offset, long long fragments_count, 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);
 

include/Subfiles/WavSubfile.h → include/Subfiles/WavSubFile.h

@@ -5,14 +5,16 @@
 #ifndef LOTRO_DAT_LIBRARY_WAVSUBFILE_H
 #define LOTRO_DAT_LIBRARY_WAVSUBFILE_H
 
-#include "Subfile.h"
+#include "SubFile.h"
 
 namespace LOTRO_DAT {
-    class WavSubfile : public Subfile {
+    class WavSubFile : public SubFile {
     public:
-        WavSubfile();
+        WavSubFile() = delete;
+        explicit WavSubFile(const WavSubFile &other) = delete;
+        WavSubFile &operator =(const WavSubFile &other) = delete;
 
-        WavSubfile(DatFile *dat, long long dictionary_offset, long long fragments_count, long long unknown1,
+        WavSubFile(DatFile &dat, long long dictionary_offset, long long fragments_count, 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);
 

src/Subfiles/DdsSubfile.cpp → src/Subfiles/DdsSubFile.cpp

@@ -2,7 +2,7 @@
 // Created by Иван_Архипов on 24.11.2017.
 //
 
-#include "Subfiles/DdsSubfile.h"
+#include "Subfiles/DdsSubFile.h"
 
 #include "BinaryData.h"
 #include "DatFile.h"
@@ -10,24 +10,22 @@
 #include "EasyLogging++/easylogging++.h"
 
 namespace LOTRO_DAT {
-    DdsSubfile::DdsSubfile() = default;
-
-    DdsSubfile::DdsSubfile(DatFile *dat, long long dictionary_offset, long long unknown1,
+    DdsSubFile::DdsSubFile(DatFile &dat, 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)
-            : Subfile(dat, dictionary_offset, unknown1, file_id, file_offset, file_size,
+            : SubFile(dat, dictionary_offset, unknown1, file_id, file_offset, file_size,
                       timestamp, version, block_size, unknown2) {
     }
 
-    FILE_TYPE DdsSubfile::FileType() const {
+    FILE_TYPE DdsSubFile::FileType() const {
         return DDS;
     }
 
-    std::string DdsSubfile::Extension() const {
+    std::string DdsSubFile::Extension() const {
         return ".dds";
     }
 
-    SubfileData DdsSubfile::PrepareForExport(const BinaryData &file_data) {
+    SubfileData DdsSubFile::PrepareForExport(const BinaryData &file_data) {
         if (file_data.Empty() || file_data.size() < 256) {
             return SubfileData();
         }
@@ -147,7 +145,7 @@ namespace LOTRO_DAT {
         return result;
     }
 
-    BinaryData DdsSubfile::MakeForImport(const BinaryData &old_data, const SubfileData &data) {
+    BinaryData DdsSubFile::MakeForImport(const BinaryData &old_data, const SubfileData &data) {
         if (!data.options["ext"] || data.options["ext"].as<std::string>() != Extension() ||
             !data.options["fid"] || data.options["fid"].as<long long>() != file_id()) {
             LOG(ERROR) << "Invalid options data!";

src/Subfiles/FontSubfile.cpp → src/Subfiles/FontSubFile.cpp

@@ -2,7 +2,7 @@
 // Created by Иван_Архипов on 24.11.2017.
 //
 
-#include "Subfiles/FontSubfile.h"
+#include "Subfiles/FontSubFile.h"
 
 #include "BinaryData.h"
 #include "DatFile.h"
@@ -10,24 +10,22 @@
 #include "EasyLogging++/easylogging++.h"
 
 namespace LOTRO_DAT {
-    FontSubfile::FontSubfile() = default;
-
-    FontSubfile::FontSubfile(DatFile *dat, long long dictionary_offset, long long unknown1,
+    FontSubFile::FontSubFile(DatFile &dat, 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)
-            : Subfile(dat, dictionary_offset, unknown1, file_id, file_offset, file_size,
+            : SubFile(dat, dictionary_offset, unknown1, file_id, file_offset, file_size,
                       timestamp, version, block_size, unknown2) {
     }
 
-    FILE_TYPE FontSubfile::FileType() const {
+    FILE_TYPE FontSubFile::FileType() const {
         return FONT;
     }
 
-    std::string FontSubfile::Extension() const {
+    std::string FontSubFile::Extension() const {
         return ".fontbin";
     }
 
-    SubfileData FontSubfile::PrepareForExport(const BinaryData &file_data) {
+    SubfileData FontSubFile::PrepareForExport(const BinaryData &file_data) {
         if (file_data.Empty()) {
             return SubfileData();
         }
@@ -39,7 +37,7 @@ namespace LOTRO_DAT {
         return result;
     }
 
-    BinaryData FontSubfile::MakeForImport(const BinaryData &old_data, const SubfileData &data) {
+    BinaryData FontSubFile::MakeForImport(const BinaryData &old_data, const SubfileData &data) {
         if (!data.options["ext"] || data.options["ext"].as<std::string>() != Extension() ||
             !data.options["fid"] || data.options["fid"].as<long long>() != file_id()) {
             LOG(ERROR) << "invalid options data!";

src/Subfiles/JpgSubfile.cpp → src/Subfiles/JpgSubFile.cpp

@@ -2,31 +2,29 @@
 // Created by Иван_Архипов on 24.11.2017.
 //
 
-#include "Subfiles/JpgSubfile.h"
+#include "Subfiles/JpgSubFile.h"
 #include "EasyLogging++/easylogging++.h"
 #include "BinaryData.h"
 #include "DatFile.h"
 #include "SubfileData.h"
 
 namespace LOTRO_DAT {
-    JpgSubfile::JpgSubfile() = default;
-
-    JpgSubfile::JpgSubfile(DatFile *dat, long long dictionary_offset, long long unknown1,
+    JpgSubFile::JpgSubFile(DatFile &dat, 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)
-            : Subfile(dat, dictionary_offset, unknown1, file_id, file_offset, file_size,
+            : SubFile(dat, dictionary_offset, unknown1, file_id, file_offset, file_size,
                       timestamp, version, block_size, unknown2) {
     }
 
-    FILE_TYPE JpgSubfile::FileType() const {
+    FILE_TYPE JpgSubFile::FileType() const {
         return JPG;
     }
 
-    std::string JpgSubfile::Extension() const {
+    std::string JpgSubFile::Extension() const {
         return std::string(".jpg");
     }
 
-    SubfileData JpgSubfile::PrepareForExport(const BinaryData &file_data) {
+    SubfileData JpgSubFile::PrepareForExport(const BinaryData &file_data) {
         if (file_data.Empty()) {
             return SubfileData();
         }
@@ -38,7 +36,7 @@ namespace LOTRO_DAT {
         return result;
     }
 
-    BinaryData JpgSubfile::MakeForImport(const BinaryData &old_data, const SubfileData &data) {
+    BinaryData JpgSubFile::MakeForImport(const BinaryData &old_data, const SubfileData &data) {
         if (!data.options["ext"] || data.options["ext"].as<std::string>() != Extension() ||
             !data.options["fid"] || data.options["fid"].as<long long>() != file_id()) {
             LOG(ERROR) << "invalid options data!";

src/Subfiles/OggSubfile.cpp → src/Subfiles/OggSubFile.cpp

@@ -2,7 +2,7 @@
 // Created by Иван_Архипов on 24.11.2017.
 //
 
-#include "Subfiles/OggSubfile.h"
+#include "Subfiles/OggSubFile.h"
 
 #include "BinaryData.h"
 #include "DatFile.h"
@@ -10,24 +10,22 @@
 #include "EasyLogging++/easylogging++.h"
 
 namespace LOTRO_DAT {
-    OggSubfile::OggSubfile() = default;
-
-    OggSubfile::OggSubfile(DatFile *dat, long long dictionary_offset, long long unknown1,
+    OggSubFile::OggSubFile(DatFile &dat, 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)
-            : Subfile(dat, dictionary_offset, unknown1, file_id, file_offset, file_size,
+            : SubFile(dat, dictionary_offset, unknown1, file_id, file_offset, file_size,
                       timestamp, version, block_size, unknown2) {
     }
 
-    FILE_TYPE OggSubfile::FileType() const {
+    FILE_TYPE OggSubFile::FileType() const {
         return OGG;
     }
 
-    std::string OggSubfile::Extension() const {
+    std::string OggSubFile::Extension() const {
         return ".ogg";
     }
 
-    SubfileData OggSubfile::PrepareForExport(const BinaryData &file_data) {
+    SubfileData OggSubFile::PrepareForExport(const BinaryData &file_data) {
         if (file_data.Empty()) {
             return SubfileData();
         }
@@ -39,7 +37,7 @@ namespace LOTRO_DAT {
         return result;
     }
 
-    BinaryData OggSubfile::MakeForImport(const BinaryData &old_data, const SubfileData &data) {
+    BinaryData OggSubFile::MakeForImport(const BinaryData &old_data, const SubfileData &data) {
         if (!data.options["ext"] || data.options["ext"].as<std::string>() != Extension() ||
             !data.options["fid"] || data.options["fid"].as<long long>() != file_id()) {
             LOG(ERROR) << "invalid options data!";

src/Subfiles/TextSubfile.cpp → src/Subfiles/TextSubFile.cpp

@@ -2,7 +2,7 @@
 // Created by Иван_Архипов on 24.11.2017.
 //
 
-#include "Subfiles/TextSubfile.h"
+#include "Subfiles/TextSubFile.h"
 
 #include "BinaryData.h"
 #include "DatFile.h"
@@ -48,24 +48,22 @@ std::string argumentsFromUtf16(const std::u16string &args) {
 }
 
 namespace LOTRO_DAT {
-    TextSubfile::TextSubfile() = default;
-
-    TextSubfile::TextSubfile(DatFile *dat, long long dictionary_offset, long long unknown1,
+    TextSubFile::TextSubFile(DatFile &dat, 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)
-            : Subfile(dat, dictionary_offset, unknown1, file_id, file_offset, file_size,
+            : SubFile(dat, dictionary_offset, unknown1, file_id, file_offset, file_size,
                       timestamp, version, block_size, unknown2) {
     }
 
-    FILE_TYPE TextSubfile::FileType() const {
+    FILE_TYPE TextSubFile::FileType() const {
         return TEXT;
     }
 
-    std::string TextSubfile::Extension() const {
+    std::string TextSubFile::Extension() const {
         return std::string(".txt");
     }
 
-    SubfileData TextSubfile::PrepareForExport(const BinaryData &file_data) {
+    SubfileData TextSubFile::PrepareForExport(const BinaryData &file_data) {
         if (file_data.Empty()) {
             return SubfileData();
         }
@@ -111,7 +109,7 @@ namespace LOTRO_DAT {
         return result;
     }
 
-    BinaryData TextSubfile::MakeForImport(const BinaryData &old_data, const SubfileData &data) {
+    BinaryData TextSubFile::MakeForImport(const BinaryData &old_data, const SubfileData &data) {
         LOG(DEBUG) << "Preparing text file " << file_id() << " for import.";
         std::unordered_map<long long, SubfileData> patch_fragments = ParsePatchFragments(data);
 
@@ -158,7 +156,7 @@ namespace LOTRO_DAT {
         return new_data;
     }
 
-    std::unordered_map<long long, SubfileData> TextSubfile::ParsePatchFragments(const SubfileData &data) {
+    std::unordered_map<long long, SubfileData> TextSubFile::ParsePatchFragments(const SubfileData &data) {
         LOG(DEBUG) << "Started parsing patch fragments";
         std::unordered_map<long long, SubfileData> res;
         std::u16string text = data.text_data;
@@ -202,7 +200,7 @@ namespace LOTRO_DAT {
 
     // Make pieces/arguments/argument strings functions
 
-    std::vector<std::u16string> TextSubfile::MakePieces(const BinaryData &data, long long &offset) {
+    std::vector<std::u16string> TextSubFile::MakePieces(const BinaryData &data, long long &offset) {
         LOG(DEBUG) << "Started making pieces";
         long long num_pieces = data.ToNumber<4>(offset);
         offset += 4;
@@ -233,7 +231,7 @@ namespace LOTRO_DAT {
         return text_pieces;
     }
 
-    std::vector<long long> TextSubfile::MakeArgumentReferences(const BinaryData &data, long long &offset) {
+    std::vector<long long> TextSubFile::MakeArgumentReferences(const BinaryData &data, long long &offset) {
         LOG(DEBUG) << "Started making argument references";
         std::vector<long long> arg_references;
 
@@ -248,7 +246,7 @@ namespace LOTRO_DAT {
         return arg_references;
     }
 
-    std::vector<std::vector<BinaryData>> TextSubfile::MakeArgumentStrings(const BinaryData &data, long long &offset) {
+    std::vector<std::vector<BinaryData>> TextSubFile::MakeArgumentStrings(const BinaryData &data, long long &offset) {
         LOG(DEBUG) << "Started making argument strings";
         std::vector<std::vector<BinaryData> > arg_strings;
         long long num_arg_strings = data.ToNumber<1>(offset);
@@ -277,7 +275,7 @@ namespace LOTRO_DAT {
 
     // Build pieces/arguments/argument strings functions from fragment SubfileData
 
-    BinaryData TextSubfile::BuildPieces(const BinaryData &data, const SubfileData &new_data, long long &offset) {
+    BinaryData TextSubFile::BuildPieces(const BinaryData &data, const SubfileData &new_data, long long &offset) {
         LOG(DEBUG) << "Started building pieces";
         // Moving &offset pointer in &data
         GetPieceData(data, offset);
@@ -322,7 +320,7 @@ namespace LOTRO_DAT {
         return result;
     }
 
-    BinaryData TextSubfile::BuildArgumentReferences(const BinaryData &data, const SubfileData &new_data,
+    BinaryData TextSubFile::BuildArgumentReferences(const BinaryData &data, const SubfileData &new_data,
                                                     long long &offset) {
         LOG(DEBUG) << "Started building argument refs";
         // Moving &offset pointer in &data
@@ -360,7 +358,7 @@ namespace LOTRO_DAT {
         return result;
     }
 
-    BinaryData TextSubfile::BuildArgumentStrings(const BinaryData &data, const SubfileData &, long long &offset) {
+    BinaryData TextSubFile::BuildArgumentStrings(const BinaryData &data, const SubfileData &, long long &offset) {
         LOG(DEBUG) << "Started building argument strings";
         LOG(DEBUG) << "Built arg strings successfully";
         return GetArgumentStringsData(data, offset);
@@ -368,7 +366,7 @@ namespace LOTRO_DAT {
 
     // Get BinaryData contents of pieces/arguments/argument strings
 
-    BinaryData TextSubfile::GetPieceData(const BinaryData &data, long long &offset) const {
+    BinaryData TextSubFile::GetPieceData(const BinaryData &data, long long &offset) const {
         LOG(DEBUG) << "Started getting piece data";
         long long old_offset = offset;
 
@@ -388,7 +386,7 @@ namespace LOTRO_DAT {
         return data.CutData(old_offset, offset);
     }
 
-    BinaryData TextSubfile::GetArgumentReferenceData(const BinaryData &data, long long &offset) const {
+    BinaryData TextSubFile::GetArgumentReferenceData(const BinaryData &data, long long &offset) const {
         LOG(DEBUG) << "Started getting arg refs data";
         long long old_offset = offset;
         long long num_references = data.ToNumber<4>(offset);
@@ -398,7 +396,7 @@ namespace LOTRO_DAT {
         return data.CutData(old_offset, offset);
     }
 
-    BinaryData TextSubfile::GetArgumentStringsData(const BinaryData &data, long long &offset) const {
+    BinaryData TextSubFile::GetArgumentStringsData(const BinaryData &data, long long &offset) const {
         LOG(DEBUG) << "Started getting arg strings data";
         long long old_offset = offset;
 

src/Subfiles/UnknownSubfile.cpp → src/Subfiles/UnknownSubFile.cpp

@@ -2,7 +2,7 @@
 // Created by Иван_Архипов on 24.11.2017.
 //
 
-#include "Subfiles/UnknownSubfile.h"
+#include "Subfiles/UnknownSubFile.h"
 
 #include "BinaryData.h"
 #include "DatFile.h"
@@ -10,24 +10,22 @@
 #include "EasyLogging++/easylogging++.h"
 
 namespace LOTRO_DAT {
-    UnknownSubfile::UnknownSubfile() = default;
-
-    UnknownSubfile::UnknownSubfile(DatFile *dat, long long dictionary_offset, long long unknown1,
+    UnknownSubFile::UnknownSubFile(DatFile &dat, 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)
-            : Subfile(dat, dictionary_offset, unknown1, file_id, file_offset, file_size,
+            : SubFile(dat, dictionary_offset, unknown1, file_id, file_offset, file_size,
                       timestamp, version, block_size, unknown2) {
     }
 
-    FILE_TYPE UnknownSubfile::FileType() const {
+    FILE_TYPE UnknownSubFile::FileType() const {
         return UNKNOWN;
     }
 
-    std::string UnknownSubfile::Extension() const {
+    std::string UnknownSubFile::Extension() const {
         return std::string(".unknown");
     }
 
-    SubfileData UnknownSubfile::PrepareForExport(const BinaryData &file_data) {
+    SubfileData UnknownSubFile::PrepareForExport(const BinaryData &file_data) {
         if (file_data.Empty()) {
             return SubfileData();
         }
@@ -39,7 +37,7 @@ namespace LOTRO_DAT {
         return result;
     }
 
-    BinaryData UnknownSubfile::MakeForImport(const BinaryData &, const SubfileData &data) {
+    BinaryData UnknownSubFile::MakeForImport(const BinaryData &, const SubfileData &data) {
         if (!data.options["ext"] || data.options["ext"].as<std::string>() != Extension() ||
             !data.options["fid"] || data.options["fid"].as<long long>() != file_id()) {
             LOG(ERROR) << "invalid options data!";

src/Subfiles/WavSubfile.cpp → src/Subfiles/WavSubFile.cpp

@@ -2,7 +2,7 @@
 // Created by Иван_Архипов on 24.11.2017.
 //
 
-#include "Subfiles/WavSubfile.h"
+#include "Subfiles/WavSubFile.h"
 
 #include "BinaryData.h"
 #include "DatFile.h"
@@ -10,24 +10,24 @@
 #include "EasyLogging++/easylogging++.h"
 
 namespace LOTRO_DAT {
-    WavSubfile::WavSubfile() = default;
+    WavSubFile::WavSubFile() = default;
 
-    WavSubfile::WavSubfile(DatFile *dat, long long dictionary_offset, long long unknown1,
+    WavSubFile::WavSubFile(DatFile &dat, 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)
-            : Subfile(dat, dictionary_offset, unknown1, file_id, file_offset, file_size,
+            : SubFile(dat, dictionary_offset, unknown1, file_id, file_offset, file_size,
                       timestamp, version, block_size, unknown2) {
     }
 
-    FILE_TYPE WavSubfile::FileType() const {
+    FILE_TYPE WavSubFile::FileType() const {
         return WAV;
     }
 
-    std::string WavSubfile::Extension() const {
+    std::string WavSubFile::Extension() const {
         return ".wav";
     }
 
-    SubfileData WavSubfile::PrepareForExport(const BinaryData &file_data) {
+    SubfileData WavSubFile::PrepareForExport(const BinaryData &file_data) {
         if (file_data.Empty()) {
             return SubfileData();
         }
@@ -39,7 +39,7 @@ namespace LOTRO_DAT {
         return result;
     }
 
-    BinaryData WavSubfile::MakeForImport(const BinaryData &old_data, const SubfileData &data) {
+    BinaryData WavSubFile::MakeForImport(const BinaryData &old_data, const SubfileData &data) {
         if (!data.options["ext"] || data.options["ext"].as<std::string>() != Extension() ||
             !data.options["fid"] || data.options["fid"].as<long long>() != file_id()) {
             LOG(ERROR) << "invalid options data!";