From 441232de7339af9f7755fb1cb27fc00bfeb36414 Mon Sep 17 00:00:00 2001
From: Sander Speetjens <sander.speetjens@gmail.com>
Date: Thu, 17 Oct 2024 09:29:23 +0200
Subject: [PATCH] Update websocket wrapper

now using size_t as id type instead of QString
---
 Qt/web_socket_wrapper.cpp | 28 +++++++++++++++++++---------
 Qt/web_socket_wrapper.h   |  9 +++++----
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/Qt/web_socket_wrapper.cpp b/Qt/web_socket_wrapper.cpp
index e548c32..d34fa9c 100644
--- a/Qt/web_socket_wrapper.cpp
+++ b/Qt/web_socket_wrapper.cpp
@@ -25,14 +25,14 @@ Web_socket_wrapper::~Web_socket_wrapper()
     close();
 }
 
-void Web_socket_wrapper::send_command(Command command, QString id)
+void Web_socket_wrapper::send_command(Command command, size_t id)
 {
     json j;
     switch (command)
     {
         case Command::get_UI_element:
             j["command"]["type"] = magic_enum::enum_name(command).data();
-            j["command"]["id"] = id.toStdString();
+            j["command"]["id"] = id;
             m_web_socket->sendTextMessage(QString(j.dump().data()));
             break;
         case Command::get_UI_elements:
@@ -47,6 +47,16 @@ void Web_socket_wrapper::send_command(Command command, QString id)
             j["command"]["type"] = magic_enum::enum_name(command).data();
             m_web_socket->sendTextMessage(QString(j.dump().data()));
             break;
+        default:
+            break;
+    }
+}
+
+void Web_socket_wrapper::send_command(Command command, QString id)
+{
+    json j;
+    switch (command)
+    {
         case Command::switch_simulator:
             j["command"]["type"] = magic_enum::enum_name(command).data();
             j["command"]["name"] = id.toStdString();
@@ -57,14 +67,14 @@ void Web_socket_wrapper::send_command(Command command, QString id)
     }
 }
 
-void Web_socket_wrapper::send_event(Event event, QString id)
+void Web_socket_wrapper::send_event(Event event, size_t id)
 {
     json j;
     switch (event)
     {
         case Event::clicked:
             j["event"]["type"] = magic_enum::enum_name(event).data();
-            j["event"]["id"] = id.toStdString();
+            j["event"]["id"] = id;
             m_web_socket->sendTextMessage(QString(j.dump().data()));
             break;
         default:
@@ -72,14 +82,14 @@ void Web_socket_wrapper::send_event(Event event, QString id)
     }
 }
 
-void Web_socket_wrapper::send_event(Event event, QString id, double val)
+void Web_socket_wrapper::send_event(Event event, size_t id, double val)
 {
     json j;
     switch (event)
     {
         case Event::value_changed:
             j["event"]["type"] = magic_enum::enum_name(event).data();
-            j["event"]["id"] = id.toStdString();
+            j["event"]["id"] = id;
             j["event"]["value"] = val;
             m_web_socket->sendTextMessage(QString(j.dump().data()));
             break;
@@ -88,20 +98,20 @@ void Web_socket_wrapper::send_event(Event event, QString id, double val)
     }
 }
 
-void Web_socket_wrapper::send_event(Event event, QString id, QString val)
+void Web_socket_wrapper::send_event(Event event, size_t id, QString val)
 {
     json j;
     switch (event)
     {
         case Event::text_changed:
             j["event"]["type"] = magic_enum::enum_name(event).data();
-            j["event"]["id"] = id.toStdString();
+            j["event"]["id"] = id;
             j["event"]["text"] = val.toStdString();
             m_web_socket->sendTextMessage(QString(j.dump().data()));
             break;
         case Event::selected:
             j["event"]["type"] = magic_enum::enum_name(event).data();
-            j["event"]["id"] = id.toStdString();
+            j["event"]["id"] = id;
             j["event"]["selected"] = val.toStdString();
             m_web_socket->sendTextMessage(QString(j.dump().data()));
             break;
diff --git a/Qt/web_socket_wrapper.h b/Qt/web_socket_wrapper.h
index adce380..c2a0c66 100644
--- a/Qt/web_socket_wrapper.h
+++ b/Qt/web_socket_wrapper.h
@@ -34,10 +34,11 @@ class Web_socket_wrapper : public QObject
   public:
     explicit Web_socket_wrapper(const QUrl &url, QObject *parent = nullptr);
     ~Web_socket_wrapper();
-    void send_command(Command command, QString id = QString());
-    void send_event(Event event, QString id);
-    void send_event(Event event, QString id, double val);
-    void send_event(Event event, QString id, QString val);
+    void send_command(Command command, size_t id = 0);
+    void send_command(Command command, QString id);
+    void send_event(Event event, size_t id);
+    void send_event(Event event, size_t id, double val);
+    void send_event(Event event, size_t id, QString val);
     void close();
 
   Q_SIGNALS: