Refactor to accept new Library structure

src/reports/ExcelFile.cc

@@ -1,5 +1,5 @@
+#include "common/Paths.h"
 #include "ExcelFile.h"
-#include "Paths.h"
 
 namespace platform {
     ExcelFile::ExcelFile()

src/reports/ExcelFile.h

@@ -3,7 +3,7 @@
 #include <locale>
 #include <string>
 #include <map>
-#include "xlsxwriter.h"
+#include <xlsxwriter.h>
 
 namespace platform {
     struct separated : std::numpunct<char> {

src/reports/ReportBase.cc

@@ -1,8 +1,8 @@
 #include <sstream>
 #include <locale>
-#include "Datasets.h"
+#include "common/Datasets.h"
+#include "common/DotEnv.h"
 #include "ReportBase.h"
-#include "DotEnv.h"
 
 namespace platform {
     ReportBase::ReportBase(json data_, bool compare) : data(data_), compare(compare), margin(0.1)

src/reports/ReportBase.h

@@ -2,9 +2,9 @@
 #define REPORTBASE_H
 #include <string>
 #include <iostream>
-#include "Paths.h"
-#include "Symbols.h"
 #include <nlohmann/json.hpp>
+#include "common/Paths.h"
+#include "common/Symbols.h"
 
 using json = nlohmann::json;
 namespace platform {

src/reports/ReportConsole.cc

@@ -1,9 +1,9 @@
 #include <iostream>
 #include <sstream>
 #include <locale>
+#include "best/BestScore.h"
+#include "common/CLocale.h"
 #include "ReportConsole.h"
-#include "BestScore.h"
-#include "CLocale.h"
 
 namespace platform {
     std::string ReportConsole::headerLine(const std::string& text, int utf = 0)

src/reports/ReportConsole.h

@@ -1,8 +1,8 @@
 #ifndef REPORTCONSOLE_H
 #define REPORTCONSOLE_H
 #include <string>
+#include "common/Colors.h"
 #include "ReportBase.h"
-#include "Colors.h"
 
 namespace platform {
     const int MAXL = 133;

src/reports/ReportExcel.cc

@@ -1,7 +1,7 @@
 #include <sstream>
 #include <locale>
+#include "best/BestScore.h"
 #include "ReportExcel.h"
-#include "BestScore.h"
 
 
 namespace platform {

src/reports/ReportExcel.h

@@ -1,10 +1,10 @@
 #ifndef REPORTEXCEL_H
 #define REPORTEXCEL_H
-#include<map>
-#include "xlsxwriter.h"
+#include <map>
+#include <xlsxwriter.h>
+#include "common/Colors.h"
 #include "ReportBase.h"
 #include "ExcelFile.h"
-#include "Colors.h"
 namespace platform {
     class ReportExcel : public ReportBase, public ExcelFile {
     public: