Namespaces and formatting

file/include/simdata/simdataXP.hpp

@@ -79,10 +79,11 @@ namespace file
       int validCount = 0;
 
       while (std::getline(infile, line)) {
-        std::vector<std::string> fields = util::split(line, ' ');
-        fields = util::select_T<std::string>(fields, [](const std::string &s) {
-          return s.length() > 0;
-        });
+        std::vector<std::string> fields = utilities::split(line, ' ');
+        fields =
+            utilities::select_T<std::string>(fields, [](const std::string &s) {
+              return s.length() > 0;
+            });
 
         if (fields.empty())
           continue;
@@ -173,7 +174,7 @@ namespace file
       std::vector<std::string> packs;
       while (std::getline(custom, line)) {
         if ((pos = line.find("SCENERY_PACK")) != std::string::npos) {
-          std::string path = util::rtrim_copy(line.substr(pos + 13)) +
+          std::string path = utilities::rtrim_copy(line.substr(pos + 13)) +
                              "Earth nav data/apt.dat";
           packs.emplace_back(path);
         }