From bc7b8d330afcbe8476f6215694ef7043d5b8200b Mon Sep 17 00:00:00 2001 From: tt2468 Date: Sun, 21 Nov 2021 03:13:53 -0800 Subject: [PATCH] RequestHandler: Move RequestStatus.h to types directory --- CMakeLists.txt | 2 +- src/requesthandler/RequestHandler.h | 2 +- src/requesthandler/rpc/Request.h | 2 +- src/requesthandler/rpc/RequestResult.h | 2 +- src/requesthandler/{rpc => types}/RequestStatus.h | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename src/requesthandler/{rpc => types}/RequestStatus.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6edae19c..84961ff6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -133,9 +133,9 @@ set(obs-websocket_HEADERS src/eventhandler/EventHandler.h src/eventhandler/types/EventSubscription.h src/requesthandler/RequestHandler.h + src/requesthandler/types/RequestStatus.h src/requesthandler/rpc/Request.h src/requesthandler/rpc/RequestResult.h - src/requesthandler/rpc/RequestStatus.h src/forms/SettingsDialog.h src/forms/ConnectInfo.h src/utils/Crypto.h diff --git a/src/requesthandler/RequestHandler.h b/src/requesthandler/RequestHandler.h index 7defd421..96c176eb 100644 --- a/src/requesthandler/RequestHandler.h +++ b/src/requesthandler/RequestHandler.h @@ -23,9 +23,9 @@ with this program. If not, see #include #include -#include "rpc/RequestStatus.h" #include "rpc/Request.h" #include "rpc/RequestResult.h" +#include "types/RequestStatus.h" #include "../websocketserver/rpc/WebSocketSession.h" #include "../obs-websocket.h" #include "../utils/Obs.h" diff --git a/src/requesthandler/rpc/Request.h b/src/requesthandler/rpc/Request.h index 299560ae..0ec20e83 100644 --- a/src/requesthandler/rpc/Request.h +++ b/src/requesthandler/rpc/Request.h @@ -19,7 +19,7 @@ with this program. If not, see #pragma once -#include "RequestStatus.h" +#include "../types/RequestStatus.h" #include "../../utils/Json.h" enum ObsWebSocketRequestBatchExecutionType { diff --git a/src/requesthandler/rpc/RequestResult.h b/src/requesthandler/rpc/RequestResult.h index 36e5d577..6ec410c0 100644 --- a/src/requesthandler/rpc/RequestResult.h +++ b/src/requesthandler/rpc/RequestResult.h @@ -19,7 +19,7 @@ with this program. If not, see #pragma once -#include "RequestStatus.h" +#include "../types/RequestStatus.h" #include "../../utils/Json.h" struct RequestResult diff --git a/src/requesthandler/rpc/RequestStatus.h b/src/requesthandler/types/RequestStatus.h similarity index 100% rename from src/requesthandler/rpc/RequestStatus.h rename to src/requesthandler/types/RequestStatus.h