Namespaces and formatting

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