Namespaces and formatting

websocket/include/types.h

@@ -1,51 +1,64 @@
-#ifndef GERMANAIRLINESVA_GACONNECTOR_SOCKET_TYPES_H
-#define GERMANAIRLINESVA_GACONNECTOR_SOCKET_TYPES_H
+#ifndef GERMANAIRLINESVA_GACONNECTOR_WEBSOCKET_TYPES_H
+#define GERMANAIRLINESVA_GACONNECTOR_WEBSOCKET_TYPES_H
 
 #include <cstdint>
 
 namespace germanairlinesva
 {
-namespace websocket
+namespace gaconnector
 {
+  namespace websocket
+  {
 #pragma pack(push) /* push current alignment to stack */
 #pragma pack(1)    /* set alignment to 1 byte boundary */
 
-  /* Structures and enums */
-  struct data {
-      std::int32_t pause = 0;
-      float pBrake = 0;
-      std::int32_t onGrnd = 0;
-      float totFuelKg = 0;
-      float truHdg = 0;
-      double alt = 0;
-      float gs = 0;
-      float ias = 0;
-      float vs = 0;
-      double lat = 0;
-      double lon = 0;
-      float ff[8] = {0, 0, 0, 0, 0, 0, 0, 0};
-      float maxSpd = 0;
-      char path[513] = "";
-      float uptime = 0;
-      float magHeading = 0;
-      float payloadKg = 0;
-      float totalWeightKg = 0;
-  };
+    /* Structures and enums */
+    struct data {
+        std::int32_t pause = 0;
+        float pBrake = 0;
+        std::int32_t onGrnd = 0;
+        float totFuelKg = 0;
+        float truHdg = 0;
+        double alt = 0;
+        float gs = 0;
+        float ias = 0;
+        float vs = 0;
+        double lat = 0;
+        double lon = 0;
+        float ff[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+        float maxSpd = 0;
+        char path[513] = "";
+        float uptime = 0;
+        float magHeading = 0;
+        float payloadKg = 0;
+        float totalWeightKg = 0;
+    };
 
-  enum commands { PROCESS, SAVE, LOAD, TEXT, TIME, UNPAUSE, PAUSE, PORT, END };
+    enum commands {
+      PROCESS,
+      SAVE,
+      LOAD,
+      TEXT,
+      TIME,
+      UNPAUSE,
+      PAUSE,
+      PORT,
+      END
+    };
 
-  struct command_base {
-      enum commands type;
-  };
+    struct command_base {
+        enum commands type;
+    };
 
-  struct command_port {
-      double latitude;
-      double longitude;
-      float trueHeading;
-  };
+    struct command_port {
+        double latitude;
+        double longitude;
+        float trueHeading;
+    };
 
 #pragma pack(pop) /* restore original alignment from stack */
-} // namespace websocket
+  }               // namespace websocket
+} // namespace gaconnector
 } // namespace germanairlinesva
 
 #endif

websocket/include/websocket.h

@@ -1,5 +1,5 @@
-#ifndef GERMANAIRLINESVA_GACONNECTOR_WEBSOCKET_H
-#define GERMANAIRLINESVA_GACONNECTOR_WEBSOCKET_H
+#ifndef GERMANAIRLINESVA_GACONNECTOR_WEBSOCKET_WEBSOCKET_H
+#define GERMANAIRLINESVA_GACONNECTOR_WEBSOCKET_WEBSOCKET_H
 
 #define BUFSIZE 1024
 #define MD5LEN 16
@@ -20,27 +20,30 @@
 
 namespace germanairlinesva
 {
-namespace websocket
+namespace gaconnector
 {
-  class Websocket
+  namespace websocket
   {
-    private:
-      char lastPath[513] = "";
-      char lastHash[2 * MD5LEN + 1] = "";
-      ix::WebSocket *webSocket = nullptr;
-      std::string host;
-      std::string user;
-      std::function<void(const std::string)> toLog;
+    class Websocket
+    {
+      private:
+        char lastPath[513] = "";
+        char lastHash[2 * MD5LEN + 1] = "";
+        ix::WebSocket *webSocket = nullptr;
+        std::string host;
+        std::string user;
+        std::function<void(const std::string)> toLog;
 
-    public:
-      Websocket(std::string host,
-                std::string user,
-                std::function<void(const std::string)> toLog);
-      ~Websocket();
-      void onClientMessageCallback(const ix::WebSocketMessagePtr &msg);
-      void sendData(data &d);
-  };
-} // namespace websocket
+      public:
+        Websocket(std::string host,
+                  std::string user,
+                  std::function<void(const std::string)> toLog);
+        ~Websocket();
+        void onClientMessageCallback(const ix::WebSocketMessagePtr &msg);
+        void sendData(data &d);
+    };
+  } // namespace websocket
+} // namespace gaconnector
 } // namespace germanairlinesva
 
 #endif