From dff81e62fe6f6dbf0689b1349513d43be93dddca Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sun, 1 Mar 2026 23:06:06 -0500 Subject: [PATCH] chore: move base/NetworkProtocol -> common/NetworkProtocol --- src/lib/base/CMakeLists.txt | 1 - src/lib/client/Client.cpp | 2 +- src/lib/common/CMakeLists.txt | 1 + src/lib/{base => common}/NetworkProtocol.h | 0 src/lib/gui/config/ServerConfig.h | 2 +- src/lib/gui/dialogs/ServerConfigDialog.cpp | 2 +- src/lib/server/Server.h | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename src/lib/{base => common}/NetworkProtocol.h (100%) diff --git a/src/lib/base/CMakeLists.txt b/src/lib/base/CMakeLists.txt index 921b5ea3a..fa812e520 100644 --- a/src/lib/base/CMakeLists.txt +++ b/src/lib/base/CMakeLists.txt @@ -26,7 +26,6 @@ add_library(base STATIC Log.cpp Log.h LogLevel.h - NetworkProtocol.h PriorityQueue.h SimpleEventQueueBuffer.cpp SimpleEventQueueBuffer.h diff --git a/src/lib/client/Client.cpp b/src/lib/client/Client.cpp index 5952013f7..871f66acd 100644 --- a/src/lib/client/Client.cpp +++ b/src/lib/client/Client.cpp @@ -11,8 +11,8 @@ #include "arch/Arch.h" #include "base/IEventQueue.h" #include "base/Log.h" -#include "base/NetworkProtocol.h" #include "client/ServerProxy.h" +#include "common/NetworkProtocol.h" #include "common/Settings.h" #include "deskflow/Clipboard.h" #include "deskflow/IPlatformScreen.h" diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt index 431f70c50..a9c2f1bcf 100644 --- a/src/lib/common/CMakeLists.txt +++ b/src/lib/common/CMakeLists.txt @@ -15,6 +15,7 @@ add_library(common STATIC ExitCodes.h I18N.h I18N.cpp + NetworkProtocol.h PlatformInfo.h Settings.h Settings.cpp diff --git a/src/lib/base/NetworkProtocol.h b/src/lib/common/NetworkProtocol.h similarity index 100% rename from src/lib/base/NetworkProtocol.h rename to src/lib/common/NetworkProtocol.h diff --git a/src/lib/gui/config/ServerConfig.h b/src/lib/gui/config/ServerConfig.h index 80e86966b..5196c56b2 100644 --- a/src/lib/gui/config/ServerConfig.h +++ b/src/lib/gui/config/ServerConfig.h @@ -7,7 +7,7 @@ #pragma once -#include "base/NetworkProtocol.h" +#include "common/NetworkProtocol.h" #include "gui/Hotkey.h" #include "gui/config/ScreenConfig.h" #include "gui/config/ScreenList.h" diff --git a/src/lib/gui/dialogs/ServerConfigDialog.cpp b/src/lib/gui/dialogs/ServerConfigDialog.cpp index e1a8ccb9b..83062f1e0 100644 --- a/src/lib/gui/dialogs/ServerConfigDialog.cpp +++ b/src/lib/gui/dialogs/ServerConfigDialog.cpp @@ -10,8 +10,8 @@ #include "common/PlatformInfo.h" #include "ui_ServerConfigDialog.h" -#include "base/NetworkProtocol.h" #include "common/Constants.h" +#include "common/NetworkProtocol.h" #include "dialogs/ActionDialog.h" #include "dialogs/HotkeyDialog.h" #include "dialogs/ScreenSettingsDialog.h" diff --git a/src/lib/server/Server.h b/src/lib/server/Server.h index 1e937f545..424cf6028 100644 --- a/src/lib/server/Server.h +++ b/src/lib/server/Server.h @@ -9,8 +9,8 @@ #pragma once #include "base/Event.h" -#include "base/NetworkProtocol.h" #include "base/Stopwatch.h" +#include "common/NetworkProtocol.h" #include "deskflow/Clipboard.h" #include "deskflow/ClipboardTypes.h" #include "deskflow/KeyTypes.h"