Namespaces and formatting

file/include/simdata/simDatabase.hpp

@@ -19,7 +19,7 @@
 #ifdef XP
 #include "simdata/simdataXP.hpp"
 #endif
-#ifndef MSFS
+#if not defined(XP) && not defined(MSFS)
 #include "simdata/simdataESP.hpp"
 #endif
 
@@ -61,7 +61,8 @@ namespace file
             std::uint16_t numGates = read<std::uint16_t>(in);
             for (int j = 0; j < numGates; j++) {
               std::string designator = readString(in);
-              struct geodata::point center = read<struct geodata::point>(in);
+              struct utilities::geodata::point center =
+                  read<struct utilities::geodata::point>(in);
               std::uint8_t radius = read<std::uint8_t>(in);
 
               this->airports[icao].first.emplace_back(designator,
@@ -73,7 +74,8 @@ namespace file
             for (int j = 0; j < numRunways; j++) {
               std::string designator = readString(in);
               // Center
-              struct geodata::box bounds = read<struct geodata::box>(in);
+              struct utilities::geodata::box bounds =
+                  read<struct utilities::geodata::box>(in);
               std::uint8_t width = read<std::uint8_t>(in);
               std::uint16_t length = read<std::uint16_t>(in);
               double trueHeading = read<double>(in);
@@ -113,7 +115,7 @@ namespace file
                            std::function<void(const std::string)> toLog)
         {
           if (strcmp(configuration->getScenery().c_str(), hash) != 0 ||
-              !util::fileExists(BASE_DIRECTORY SIMDATABASE)) {
+              !utilities::fileExists(BASE_DIRECTORY SIMDATABASE)) {
 #ifdef XP
             scan(simVersion < 12000 ? XPLANE11_BASE_SCENERY
                                     : XPLANE12_BASE_SCENERY,