Browse Source

SubFile classes compilation fixes

Ivan Arkhipov 6 years ago
parent
commit
d84e1c53fe

+ 1 - 1
include/Subfiles/DdsSubFile.h

@@ -14,7 +14,7 @@ namespace LOTRO_DAT {
         explicit DdsSubFile(const DdsSubFile &other) = delete;
         DdsSubFile &operator =(const DdsSubFile &other) = delete;
 
-        DdsSubFile(DatFile &dat, SubFile preinit_file);
+        DdsSubFile(SubFile preinit_file);
 
         FILE_TYPE FileType() const override;
 

+ 1 - 1
include/Subfiles/FontSubFile.h

@@ -15,7 +15,7 @@ namespace LOTRO_DAT {
         explicit FontSubFile(const FontSubFile &other) = delete;
         FontSubFile &operator =(const FontSubFile &other) = delete;
 
-        FontSubFile(DatFile &dat, SubFile preinit_file);
+        FontSubFile(SubFile preinit_file);
 
         FILE_TYPE FileType() const override;
 

+ 1 - 1
include/Subfiles/JpgSubFile.h

@@ -15,7 +15,7 @@ namespace LOTRO_DAT {
         explicit JpgSubFile(const JpgSubFile &other) = delete;
         JpgSubFile &operator =(const JpgSubFile &other) = delete;
 
-        JpgSubFile(DatFile &dat, SubFile preinit_file);
+        JpgSubFile(SubFile preinit_file);
 
 
         FILE_TYPE FileType() const override;

+ 1 - 1
include/Subfiles/OggSubFile.h

@@ -14,7 +14,7 @@ namespace LOTRO_DAT {
         explicit OggSubFile(const OggSubFile &other) = delete;
         OggSubFile &operator =(const OggSubFile &other) = delete;
 
-        OggSubFile(DatFile &dat, SubFile preinit_file);
+        OggSubFile(SubFile preinit_file);
 
         FILE_TYPE FileType() const override;
         std::string Extension() const override;

+ 1 - 1
include/Subfiles/TextSubFile.h

@@ -30,7 +30,7 @@ namespace LOTRO_DAT {
         SubFile &operator =(const TextSubFile &other) = delete;
 
 
-        TextSubFile(DatFile &dat, SubFile preinit_file);
+        TextSubFile(SubFile preinit_file);
 
         FILE_TYPE FileType() const override;
 

+ 1 - 1
include/Subfiles/UnknownSubFile.h

@@ -14,7 +14,7 @@ namespace LOTRO_DAT {
         explicit UnknownSubFile(const UnknownSubFile &other) = delete;
         SubFile &operator =(const UnknownSubFile &other) = delete;
 
-        UnknownSubFile(DatFile &dat, SubFile preinit_file);
+        UnknownSubFile(SubFile preinit_file);
 
         FILE_TYPE FileType() const override;
         std::string Extension() const override;

+ 1 - 1
include/Subfiles/WavSubFile.h

@@ -14,7 +14,7 @@ namespace LOTRO_DAT {
         explicit WavSubFile(const WavSubFile &other) = delete;
         WavSubFile &operator =(const WavSubFile &other) = delete;
 
-        WavSubFile(DatFile &dat, SubFile preinit_file);
+        WavSubFile(SubFile preinit_file);
 
 
         FILE_TYPE FileType() const override;

+ 3 - 3
src/SubFile.cpp

@@ -29,7 +29,7 @@ const long long MAXSIZE = 50ll * 1024ll * 1024ll; // Setting maximal file size 5
 // of Subfiles and Subdirectories search in DatFile.
 
 namespace LOTRO_DAT {
-    SubFile::SubFile() : dat_(nullptr), category(0), unknown1_(0), file_id_(0), file_offset_(0), file_size_(0),
+    SubFile::SubFile() : category(0), dat_(nullptr), unknown1_(0), file_id_(0), file_offset_(0), file_size_(0),
                          timestamp_(0), version_(0), block_size_(0), unknown2_(0) {
     }
 
@@ -183,7 +183,7 @@ namespace LOTRO_DAT {
     }
 
 
-    static std::shared_ptr<SubFile> SubFile::MakeSubfile(DatFile &dat, SubFile preinit_file) {
+    std::shared_ptr<SubFile> SubFile::MakeSubfile(DatFile &dat, SubFile preinit_file) {
         FILE_TYPE type = SubFile::GetSubfileType(dat, preinit_file);
 
         switch (type) {
@@ -206,7 +206,7 @@ namespace LOTRO_DAT {
         return std::dynamic_pointer_cast<SubFile>(std::make_shared<UnknownSubFile>(preinit_file));
     }
 
-    static FILE_TYPE SubFile::GetSubfileType(DatFile &dat, SubFile preinit_file) {
+    FILE_TYPE SubFile::GetSubfileType(DatFile &dat, SubFile preinit_file) {
         // Text check based on file_id
         if (((unsigned long long) preinit_file.file_id_ >> 24ull) == 0x25ull)
             return TEXT;

+ 1 - 1
src/Subfiles/DdsSubFile.cpp

@@ -10,7 +10,7 @@
 #include "EasyLogging++/easylogging++.h"
 
 namespace LOTRO_DAT {
-    DdsSubFile::DdsSubFile(DatFile &dat, SubFile preinit_file) : SubFile(preinit_file) {
+    DdsSubFile::DdsSubFile(SubFile preinit_file) : SubFile(preinit_file) {
     }
 
     FILE_TYPE DdsSubFile::FileType() const {

+ 1 - 1
src/Subfiles/FontSubFile.cpp

@@ -10,7 +10,7 @@
 #include "EasyLogging++/easylogging++.h"
 
 namespace LOTRO_DAT {
-    FontSubFile::FontSubFile(DatFile &dat, SubFile preinit_file) : SubFile(preinit_file) {
+    FontSubFile::FontSubFile(SubFile preinit_file) : SubFile(preinit_file) {
     }
 
     FILE_TYPE FontSubFile::FileType() const {

+ 1 - 1
src/Subfiles/JpgSubFile.cpp

@@ -9,7 +9,7 @@
 #include "SubfileData.h"
 
 namespace LOTRO_DAT {
-    JpgSubFile::JpgSubFile(DatFile &dat, SubFile preinit_file) : SubFile(preinit_file) {
+    JpgSubFile::JpgSubFile(SubFile preinit_file) : SubFile(preinit_file) {
     }
 
     FILE_TYPE JpgSubFile::FileType() const {

+ 1 - 1
src/Subfiles/OggSubFile.cpp

@@ -10,7 +10,7 @@
 #include "EasyLogging++/easylogging++.h"
 
 namespace LOTRO_DAT {
-    OggSubFile::OggSubFile(DatFile &dat, SubFile preinit_file) : SubFile(preinit_file) {
+    OggSubFile::OggSubFile(SubFile preinit_file) : SubFile(preinit_file) {
     }
 
     FILE_TYPE OggSubFile::FileType() const {

+ 1 - 1
src/Subfiles/TextSubFile.cpp

@@ -51,7 +51,7 @@ std::string argumentsFromUtf16(const std::u16string &args) {
 namespace LOTRO_DAT {
     BinaryData TextSubFile::buffer_ = BinaryData(10 * 1024 * 1024);
 
-    TextSubFile::TextSubFile(DatFile &dat, SubFile preinit_file) : SubFile(preinit_file) {
+    TextSubFile::TextSubFile(SubFile preinit_file) : SubFile(preinit_file) {
     }
 
     FILE_TYPE TextSubFile::FileType() const {

+ 1 - 1
src/Subfiles/UnknownSubFile.cpp

@@ -10,7 +10,7 @@
 #include "EasyLogging++/easylogging++.h"
 
 namespace LOTRO_DAT {
-    UnknownSubFile::UnknownSubFile(DatFile &dat, SubFile preinit_file) : SubFile(preinit_file) {
+    UnknownSubFile::UnknownSubFile(SubFile preinit_file) : SubFile(preinit_file) {
     }
 
     FILE_TYPE UnknownSubFile::FileType() const {

+ 1 - 1
src/Subfiles/WavSubFile.cpp

@@ -10,7 +10,7 @@
 #include "EasyLogging++/easylogging++.h"
 
 namespace LOTRO_DAT {
-    WavSubFile::WavSubFile(DatFile &dat, SubFile preinit_file) : SubFile(preinit_file) {
+    WavSubFile::WavSubFile(SubFile preinit_file) : SubFile(preinit_file) {
     }
 
     FILE_TYPE WavSubFile::FileType() const {