Moved Subfiles header files to include directory. Optimized .cpp include instructions

src/Subfiles/UnknownSubfile.h → include/Subfiles/UnknownSubfile.h

@@ -5,7 +5,7 @@
 #ifndef LOTRO_DAT_LIBRARY_UNKNOWNSUBFILE_H
 #define LOTRO_DAT_LIBRARY_UNKNOWNSUBFILE_H
 
-#include "../../include/Subfile.h"
+#include "Subfile.h"
 
 namespace LOTRO_DAT {
     class UnknownSubfile : public Subfile {

src/Subfiles/WavSubfile.h → include/Subfiles/WavSubfile.h

@@ -5,7 +5,7 @@
 #ifndef LOTRO_DAT_LIBRARY_WAVSUBFILE_H
 #define LOTRO_DAT_LIBRARY_WAVSUBFILE_H
 
-#include "../../include/Subfile.h"
+#include "Subfile.h"
 
 namespace LOTRO_DAT {
     class WavSubfile : public Subfile {

src/BinaryData.cpp

@@ -2,9 +2,10 @@
 // Created by Иван_Архипов on 31.10.2017.
 //
 
-#include <BinaryData.h>
-#include <DatException.h>
-#include <zlib.h>
+#include "BinaryData.h"
+#include "DatException.h"
+#include "zlib.h"
+
 #include <algorithm>
 
 extern  "C++"

src/DatFile.cpp

@@ -2,13 +2,13 @@
 // Created by Иван_Архипов on 31.10.2017.
 //
 
-#include "../include/DatFile.h"
+#include "DatFile.h"
 
-#include "../include/BinaryData.h"
-#include "../include/DatException.h"
-#include "../include/SubDirectory.h"
-#include "../include/Subfile.h"
-#include "../include/SubfileData.h"
+#include "BinaryData.h"
+#include "DatException.h"
+#include "SubDirectory.h"
+#include "Subfile.h"
+#include "SubfileData.h"
 
 #include <locale>
 #include <algorithm>

src/Database.cpp

@@ -1,8 +1,6 @@
 //
 // Created by Иван_Архипов on 17.11.2017.
 //
-#define UNICODE
-#define _UNICODE 
 
 #include "Database.h"
 #include "DatException.h"
@@ -10,8 +8,6 @@
 #include "CommonFunctions.h"
 #include "SubfileData.h"
 
-#include <cstring>
-#include <sstream>
 
 namespace LOTRO_DAT {
     Database::Database() {

src/SubDirectory.cpp

@@ -1,16 +1,16 @@
 //
 // Created by Иван_Архипов on 07.11.2017.
 //
-#include "../include/SubDirectory.h"
+#include "SubDirectory.h"
 
-#include "../include/DatFile.h"
-#include "../include/DatException.h"
-#include "../include/Subfile.h"
-#include "../include/BinaryData.h"
+#include "DatFile.h"
+#include "DatException.h"
+#include "Subfile.h"
+#include "BinaryData.h"
 
 #include "Subfiles/TextSubfile.h"
 #include "Subfiles/DdsSubfile.h"
-#include "Subfiles/FontSubFile.h"
+#include "Subfiles/FontSubfile.h"
 #include "Subfiles/JpgSubfile.h"
 #include "Subfiles/OggSubfile.h"
 #include "Subfiles/WavSubfile.h"

src/Subfile.cpp

@@ -2,11 +2,11 @@
 // Created by Иван_Архипов on 01.11.2017.
 //
 
-#include "../include/Subfile.h"
-#include "../include/BinaryData.h"
-#include "../include/DatFile.h"
-#include "../include/DatException.h"
-#include "../include/SubfileData.h"
+#include "Subfile.h"
+#include "BinaryData.h"
+#include "DatFile.h"
+#include "DatException.h"
+#include "SubfileData.h"
 
 #include <algorithm>
 

src/Subfiles/DdsSubfile.cpp

@@ -2,12 +2,12 @@
 // Created by Иван_Архипов on 24.11.2017.
 //
 
-#include "DdsSubfile.h"
+#include "Subfiles/DdsSubfile.h"
 
-#include "../../include/BinaryData.h"
-#include "../../include/DatFile.h"
-#include "../../include/DatException.h"
-#include "../../include/SubfileData.h"
+#include "BinaryData.h"
+#include "DatFile.h"
+#include "DatException.h"
+#include "SubfileData.h"
 
 namespace LOTRO_DAT {
     DdsSubfile::DdsSubfile() = default;

src/Subfiles/FontSubfile.cpp

@@ -2,11 +2,12 @@
 // Created by Иван_Архипов on 24.11.2017.
 //
 
-#include "FontSubfile.h"
-#include "../../include/BinaryData.h"
-#include "../../include/DatFile.h"
-#include "../../include/DatException.h"
-#include "../../include/SubfileData.h"
+#include "Subfiles/FontSubfile.h"
+
+#include "BinaryData.h"
+#include "DatFile.h"
+#include "DatException.h"
+#include "SubfileData.h"
 
 namespace LOTRO_DAT {
     FontSubfile::FontSubfile() = default;

src/Subfiles/JpgSubfile.cpp

@@ -2,11 +2,12 @@
 // Created by Иван_Архипов on 24.11.2017.
 //
 
-#include "JpgSubfile.h"
-#include "../../include/BinaryData.h"
-#include "../../include/DatFile.h"
-#include "../../include/DatException.h"
-#include "../../include/SubfileData.h"
+#include "Subfiles/JpgSubfile.h"
+
+#include "BinaryData.h"
+#include "DatFile.h"
+#include "DatException.h"
+#include "SubfileData.h"
 
 namespace LOTRO_DAT {
     JpgSubfile::JpgSubfile() = default;

src/Subfiles/OggSubfile.cpp

@@ -2,11 +2,12 @@
 // Created by Иван_Архипов on 24.11.2017.
 //
 
-#include "OggSubfile.h"
-#include "../../include/BinaryData.h"
-#include "../../include/DatFile.h"
-#include "../../include/DatException.h"
-#include "../../include/SubfileData.h"
+#include "Subfiles/OggSubfile.h"
+
+#include "BinaryData.h"
+#include "DatFile.h"
+#include "DatException.h"
+#include "SubfileData.h"
 
 namespace LOTRO_DAT {
     OggSubfile::OggSubfile() = default;

src/Subfiles/TextSubfile.cpp

@@ -2,11 +2,13 @@
 // Created by Иван_Архипов on 24.11.2017.
 //
 
-#include "TextSubfile.h"
-#include "../../include/BinaryData.h"
-#include "../../include/DatFile.h"
-#include "../../include/DatException.h"
-#include "../../include/SubfileData.h"
+#include "Subfiles/TextSubfile.h"
+
+#include "BinaryData.h"
+#include "DatFile.h"
+#include "DatException.h"
+#include "SubfileData.h"
+
 #include <algorithm>
 #include <codecvt>
 #include <locale>
@@ -14,7 +16,7 @@
 std::u16string to_utf16(long long x) {
     std::u16string res;
     while (x > 0) {
-        res += u'0' + (x % 10);
+        res += char16_t(u'0' + x % 10);
         x /= 10ll;
     }
     std::reverse(res.begin(), res.end());

src/Subfiles/UnknownSubfile.cpp

@@ -2,11 +2,12 @@
 // Created by Иван_Архипов on 24.11.2017.
 //
 
-#include "UnknownSubfile.h"
-#include "../../include/BinaryData.h"
-#include "../../include/DatFile.h"
-#include "../../include/DatException.h"
-#include "../../include/SubfileData.h"
+#include "Subfiles/UnknownSubfile.h"
+
+#include "BinaryData.h"
+#include "DatFile.h"
+#include "DatException.h"
+#include "SubfileData.h"
 
 namespace LOTRO_DAT {
     UnknownSubfile::UnknownSubfile() = default;

src/Subfiles/WavSubfile.cpp

@@ -2,11 +2,12 @@
 // Created by Иван_Архипов on 24.11.2017.
 //
 
-#include "WavSubfile.h"
-#include "../../include/BinaryData.h"
-#include "../../include/DatFile.h"
-#include "../../include/DatException.h"
-#include "../../include/SubfileData.h"
+#include "Subfiles/WavSubfile.h"
+
+#include "BinaryData.h"
+#include "DatFile.h"
+#include "DatException.h"
+#include "SubfileData.h"
 
 namespace LOTRO_DAT {
     WavSubfile::WavSubfile() = default;