From 5ab091a40b135f76e7778d2b7b7a0f475862a029 Mon Sep 17 00:00:00 2001 From: tt2468 Date: Thu, 18 Nov 2021 00:29:28 -0800 Subject: [PATCH] Base: Move WebSocketServer to its own directory Just helps with organization --- CMakeLists.txt | 12 ++++++------ src/forms/SettingsDialog.cpp | 2 +- src/obs-websocket.cpp | 2 +- src/requesthandler/RequestHandler.h | 2 +- src/requesthandler/RequestHandler_General.cpp | 2 +- src/{ => websocketserver}/WebSocketServer.cpp | 12 ++++++------ src/{ => websocketserver}/WebSocketServer.h | 8 ++++---- .../WebSocketServer_Protocol.cpp | 14 +++++++------- .../WebSocketServer_RequestBatchProcessing.cpp | 6 +++--- src/{ => websocketserver/rpc}/WebSocketSession.cpp | 2 +- src/{ => websocketserver/rpc}/WebSocketSession.h | 2 +- 11 files changed, 32 insertions(+), 32 deletions(-) rename src/{ => websocketserver}/WebSocketServer.cpp (98%) rename src/{ => websocketserver}/WebSocketServer.h (96%) rename src/{ => websocketserver}/WebSocketServer_Protocol.cpp (98%) rename src/{ => websocketserver}/WebSocketServer_RequestBatchProcessing.cpp (98%) rename src/{ => websocketserver/rpc}/WebSocketSession.cpp (98%) rename src/{ => websocketserver/rpc}/WebSocketSession.h (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ab45138..5db3f442 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,10 +85,10 @@ configure_file( set(obs-websocket_SOURCES src/obs-websocket.cpp src/Config.cpp - src/WebSocketServer.cpp - src/WebSocketServer_Protocol.cpp - src/WebSocketServer_RequestBatchProcessing.cpp - src/WebSocketSession.cpp + src/websocketserver/WebSocketServer.cpp + src/websocketserver/WebSocketServer_Protocol.cpp + src/websocketserver/WebSocketServer_RequestBatchProcessing.cpp + src/websocketserver/rpc/WebSocketSession.cpp src/eventhandler/EventHandler.cpp src/eventhandler/EventHandler_General.cpp src/eventhandler/EventHandler_Config.cpp @@ -124,8 +124,8 @@ set(obs-websocket_SOURCES set(obs-websocket_HEADERS src/obs-websocket.h src/Config.h - src/WebSocketServer.h - src/WebSocketSession.h + src/websocketserver/WebSocketServer.h + src/websocketserver/rpc/WebSocketSession.h src/eventhandler/EventHandler.h src/eventhandler/types/EventSubscription.h src/requesthandler/RequestHandler.h diff --git a/src/forms/SettingsDialog.cpp b/src/forms/SettingsDialog.cpp index 7a5992c4..acd8d45d 100644 --- a/src/forms/SettingsDialog.cpp +++ b/src/forms/SettingsDialog.cpp @@ -7,7 +7,7 @@ #include "SettingsDialog.h" #include "../obs-websocket.h" #include "../Config.h" -#include "../WebSocketServer.h" +#include "../websocketserver/WebSocketServer.h" #include "../utils/Crypto.h" QString GetToolTipIconHtml() diff --git a/src/obs-websocket.cpp b/src/obs-websocket.cpp index 38beeb4f..3654c669 100644 --- a/src/obs-websocket.cpp +++ b/src/obs-websocket.cpp @@ -7,7 +7,7 @@ #include "obs-websocket.h" #include "Config.h" -#include "WebSocketServer.h" +#include "websocketserver/WebSocketServer.h" #include "eventhandler/EventHandler.h" #include "forms/SettingsDialog.h" diff --git a/src/requesthandler/RequestHandler.h b/src/requesthandler/RequestHandler.h index 4c057c15..c3475524 100644 --- a/src/requesthandler/RequestHandler.h +++ b/src/requesthandler/RequestHandler.h @@ -7,7 +7,7 @@ #include "rpc/RequestStatus.h" #include "rpc/Request.h" #include "rpc/RequestResult.h" -#include "../WebSocketSession.h" +#include "../websocketserver/rpc/WebSocketSession.h" #include "../obs-websocket.h" #include "../utils/Obs.h" #include "../plugin-macros.generated.h" diff --git a/src/requesthandler/RequestHandler_General.cpp b/src/requesthandler/RequestHandler_General.cpp index bb631e38..bd2108ab 100644 --- a/src/requesthandler/RequestHandler_General.cpp +++ b/src/requesthandler/RequestHandler_General.cpp @@ -1,7 +1,7 @@ #include #include "RequestHandler.h" -#include "../WebSocketServer.h" +#include "../websocketserver/WebSocketServer.h" #include "../eventhandler/types/EventSubscription.h" #include "../obs-websocket.h" diff --git a/src/WebSocketServer.cpp b/src/websocketserver/WebSocketServer.cpp similarity index 98% rename from src/WebSocketServer.cpp rename to src/websocketserver/WebSocketServer.cpp index d697ada7..c71599f8 100644 --- a/src/WebSocketServer.cpp +++ b/src/websocketserver/WebSocketServer.cpp @@ -5,12 +5,12 @@ #include #include "WebSocketServer.h" -#include "eventhandler/EventHandler.h" -#include "obs-websocket.h" -#include "Config.h" -#include "utils/Crypto.h" -#include "utils/Platform.h" -#include "utils/Compat.h" +#include "../eventhandler/EventHandler.h" +#include "../obs-websocket.h" +#include "../Config.h" +#include "../utils/Crypto.h" +#include "../utils/Platform.h" +#include "../utils/Compat.h" WebSocketServer::WebSocketServer() : QObject(nullptr), diff --git a/src/WebSocketServer.h b/src/websocketserver/WebSocketServer.h similarity index 96% rename from src/WebSocketServer.h rename to src/websocketserver/WebSocketServer.h index 359b84c4..f4b41d5e 100644 --- a/src/WebSocketServer.h +++ b/src/websocketserver/WebSocketServer.h @@ -7,10 +7,10 @@ #include #include -#include "utils/Json.h" -#include "WebSocketSession.h" -#include "requesthandler/rpc/Request.h" -#include "plugin-macros.generated.h" +#include "rpc/WebSocketSession.h" +#include "../utils/Json.h" +#include "../requesthandler/rpc/Request.h" +#include "../plugin-macros.generated.h" class WebSocketServer : QObject { diff --git a/src/WebSocketServer_Protocol.cpp b/src/websocketserver/WebSocketServer_Protocol.cpp similarity index 98% rename from src/WebSocketServer_Protocol.cpp rename to src/websocketserver/WebSocketServer_Protocol.cpp index 11e735b2..92b028e3 100644 --- a/src/WebSocketServer_Protocol.cpp +++ b/src/websocketserver/WebSocketServer_Protocol.cpp @@ -1,13 +1,13 @@ #include #include "WebSocketServer.h" -#include "requesthandler/RequestHandler.h" -#include "eventhandler/EventHandler.h" -#include "obs-websocket.h" -#include "Config.h" -#include "utils/Crypto.h" -#include "utils/Platform.h" -#include "utils/Compat.h" +#include "../requesthandler/RequestHandler.h" +#include "../eventhandler/EventHandler.h" +#include "../obs-websocket.h" +#include "../Config.h" +#include "../utils/Crypto.h" +#include "../utils/Platform.h" +#include "../utils/Compat.h" namespace WebSocketOpCode { enum WebSocketOpCode: uint8_t { diff --git a/src/WebSocketServer_RequestBatchProcessing.cpp b/src/websocketserver/WebSocketServer_RequestBatchProcessing.cpp similarity index 98% rename from src/WebSocketServer_RequestBatchProcessing.cpp rename to src/websocketserver/WebSocketServer_RequestBatchProcessing.cpp index a0037c22..32a25a7a 100644 --- a/src/WebSocketServer_RequestBatchProcessing.cpp +++ b/src/websocketserver/WebSocketServer_RequestBatchProcessing.cpp @@ -1,9 +1,9 @@ #include #include "WebSocketServer.h" -#include "requesthandler/RequestHandler.h" -#include "obs-websocket.h" -#include "utils/Compat.h" +#include "../requesthandler/RequestHandler.h" +#include "../obs-websocket.h" +#include "../utils/Compat.h" struct SerialFrameRequest { diff --git a/src/WebSocketSession.cpp b/src/websocketserver/rpc/WebSocketSession.cpp similarity index 98% rename from src/WebSocketSession.cpp rename to src/websocketserver/rpc/WebSocketSession.cpp index ca2f3594..03816e13 100644 --- a/src/WebSocketSession.cpp +++ b/src/websocketserver/rpc/WebSocketSession.cpp @@ -1,5 +1,5 @@ #include "WebSocketSession.h" -#include "eventhandler/types/EventSubscription.h" +#include "../../eventhandler/types/EventSubscription.h" WebSocketSession::WebSocketSession() : _remoteAddress(""), diff --git a/src/WebSocketSession.h b/src/websocketserver/rpc/WebSocketSession.h similarity index 97% rename from src/WebSocketSession.h rename to src/websocketserver/rpc/WebSocketSession.h index e6df6549..1fcf1964 100644 --- a/src/WebSocketSession.h +++ b/src/websocketserver/rpc/WebSocketSession.h @@ -5,7 +5,7 @@ #include #include -#include "plugin-macros.generated.h" +#include "../../plugin-macros.generated.h" class WebSocketSession; typedef std::shared_ptr SessionPtr;