Namespaces and formatting

xplugin/main.cpp

@@ -12,7 +12,7 @@ std::atomic<bool> wantsExit;
 
 std::shared_ptr<germanairlinesva::file::config::Config> configuration;
 std::unique_ptr<germanairlinesva::file::simdata::SimDatabase> database;
-std::unique_ptr<germanairlinesva::websocket::Websocket> connector;
+std::unique_ptr<germanairlinesva::gaconnector::websocket::Websocket> connector;
 int xplaneVersion;
 
 /* Datarefs */
@@ -43,7 +43,7 @@ XPLMDataRef pitch;
 XPLMDataRef roll;
 XPLMDataRef quaternion;
 
-struct germanairlinesva::websocket::data toSend;
+struct germanairlinesva::gaconnector::websocket::data toSend;
 germanairlinesva::file::recording::Recording p;
 
 /*
@@ -114,15 +114,17 @@ PLUGIN_API int XPluginStart(char *outName, char *outSig, char *outDesc)
   configuration = std::make_unique<germanairlinesva::file::config::Config>();
   toLog("Config loaded");
 
-  connector = std::make_unique<germanairlinesva::websocket::Websocket>(
-      "wss://ws.hofmannnet.myhome-server.de:8000",
-      configuration->getUser(),
-      toLog);
+  connector =
+      std::make_unique<germanairlinesva::gaconnector::websocket::Websocket>(
+          "wss://ws.hofmannnet.myhome-server.de:8000",
+          configuration->getUser(),
+          toLog);
   toLog("WebSocket started");
 
   char hash[2 * MD5LEN + 1] = "";
-  if (germanairlinesva::util::generateMD5(XPLANE_CUSTOM_SCENERY, hash, toLog) ==
-      0) {
+  if (germanairlinesva::utilities::generateMD5(XPLANE_CUSTOM_SCENERY,
+                                               hash,
+                                               toLog) == 0) {
     database = std::make_unique<germanairlinesva::file::simdata::SimDatabase>(
         xplaneVersion,
         hash,
@@ -216,7 +218,9 @@ float flightLoop(float elapsedMe, float elapsedSim, int counter, void *refcon)
 {
   const std::lock_guard<std::mutex> lock(mutex);
 
-  std::memset(&toSend, 0, sizeof(germanairlinesva::websocket::data));
+  std::memset(&toSend,
+              0,
+              sizeof(germanairlinesva::gaconnector::websocket::data));
 
   toSend.pause = XPLMGetDatai(pauseIndicator);
   toSend.pBrake = XPLMGetDataf(parkingBrake);
@@ -254,14 +258,16 @@ float flightLoop(float elapsedMe, float elapsedSim, int counter, void *refcon)
 
 void serverWorker()
 {
-  germanairlinesva::util::setThreadName("GAServerWorker");
+  germanairlinesva::utilities::setThreadName("GAServerWorker");
 
   while (!wantsExit) {
-    struct germanairlinesva::websocket::data copy;
+    struct germanairlinesva::gaconnector::websocket::data copy;
     {
       const std::lock_guard<std::mutex> lock(mutex);
 
-      std::memcpy(&copy, &toSend, sizeof(germanairlinesva::websocket::data));
+      std::memcpy(&copy,
+                  &toSend,
+                  sizeof(germanairlinesva::gaconnector::websocket::data));
     }
 
     connector->sendData(copy);
@@ -274,7 +280,7 @@ void serverWorker()
 
 void recordingWorker()
 {
-  germanairlinesva::util::setThreadName("GARecordingWorker");
+  germanairlinesva::utilities::setThreadName("GARecordingWorker");
 
   germanairlinesva::file::recording::RecordingEntry lastPath;
   std::uint32_t segment = 0;
@@ -283,11 +289,13 @@ void recordingWorker()
   auto rwys = ap.second;
 
   while (!wantsExit) {
-    struct germanairlinesva::websocket::data copy;
+    struct germanairlinesva::gaconnector::websocket::data copy;
     {
       const std::lock_guard<std::mutex> lock(mutex);
 
-      std::memcpy(&copy, &toSend, sizeof(germanairlinesva::websocket::data));
+      std::memcpy(&copy,
+                  &toSend,
+                  sizeof(germanairlinesva::gaconnector::websocket::data));
     }
 
     germanairlinesva::file::recording::RecordingEntry currentPath(