From 2ef23b8206ed896e5b4b2ec682406c03dc42929b Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Wed, 19 Mar 2025 17:28:51 -0400 Subject: [PATCH] chore: rename lib/deskflow/protocol_types => lib/deskflow/ProtocolTypes --- src/lib/client/Client.cpp | 2 +- src/lib/client/HelloBack.cpp | 2 +- src/lib/client/HelloBack.h | 2 +- src/lib/client/ServerProxy.cpp | 2 +- src/lib/deskflow/App.cpp | 2 +- src/lib/deskflow/CMakeLists.txt | 4 ++-- src/lib/deskflow/ClientApp.cpp | 2 +- src/lib/deskflow/ClipboardChunk.cpp | 2 +- src/lib/deskflow/FileChunk.cpp | 2 +- src/lib/deskflow/PacketStreamFilter.cpp | 2 +- src/lib/deskflow/{protocol_types.cpp => ProtocolTypes.cpp} | 2 +- src/lib/deskflow/{protocol_types.h => ProtocolTypes.h} | 0 src/lib/deskflow/ProtocolUtil.cpp | 2 +- src/lib/deskflow/Screen.cpp | 2 +- src/lib/deskflow/StreamChunker.cpp | 2 +- src/lib/platform/MSWindowsHook.cpp | 2 +- src/lib/server/ClientProxy1_0.h | 2 +- src/lib/server/ClientProxyUnknown.cpp | 2 +- src/lib/server/Config.h | 2 +- src/lib/server/InputFilter.h | 2 +- src/lib/server/PrimaryClient.h | 2 +- src/lib/server/Server.cpp | 2 +- src/test/unittests/deskflow/ClipboardChunkTests.cpp | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) rename src/lib/deskflow/{protocol_types.cpp => ProtocolTypes.cpp} (98%) rename src/lib/deskflow/{protocol_types.h => ProtocolTypes.h} (100%) diff --git a/src/lib/client/Client.cpp b/src/lib/client/Client.cpp index 2946e419e6..481e75361c 100644 --- a/src/lib/client/Client.cpp +++ b/src/lib/client/Client.cpp @@ -20,11 +20,11 @@ #include "deskflow/FileChunk.h" #include "deskflow/IPlatformScreen.h" #include "deskflow/PacketStreamFilter.h" +#include "deskflow/ProtocolTypes.h" #include "deskflow/ProtocolUtil.h" #include "deskflow/Screen.h" #include "deskflow/StreamChunker.h" #include "deskflow/XDeskflow.h" -#include "deskflow/protocol_types.h" #include "mt/Thread.h" #include "net/IDataSocket.h" #include "net/ISocketFactory.h" diff --git a/src/lib/client/HelloBack.cpp b/src/lib/client/HelloBack.cpp index a933928af2..787b6e4a57 100644 --- a/src/lib/client/HelloBack.cpp +++ b/src/lib/client/HelloBack.cpp @@ -7,8 +7,8 @@ #include "HelloBack.h" #include "base/Log.h" +#include "deskflow/ProtocolTypes.h" #include "deskflow/ProtocolUtil.h" -#include "deskflow/protocol_types.h" #include #include diff --git a/src/lib/client/HelloBack.h b/src/lib/client/HelloBack.h index 05d81dd73c..9782d46101 100644 --- a/src/lib/client/HelloBack.h +++ b/src/lib/client/HelloBack.h @@ -7,7 +7,7 @@ #pragma once #include "common/common.h" -#include "deskflow/protocol_types.h" +#include "deskflow/ProtocolTypes.h" #include "io/IStream.h" #include diff --git a/src/lib/client/ServerProxy.cpp b/src/lib/client/ServerProxy.cpp index 5e0c613695..c5ac90ecd5 100644 --- a/src/lib/client/ServerProxy.cpp +++ b/src/lib/client/ServerProxy.cpp @@ -17,10 +17,10 @@ #include "deskflow/ClipboardChunk.h" #include "deskflow/FileChunk.h" #include "deskflow/OptionTypes.h" +#include "deskflow/ProtocolTypes.h" #include "deskflow/ProtocolUtil.h" #include "deskflow/StreamChunker.h" #include "deskflow/XDeskflow.h" -#include "deskflow/protocol_types.h" #include "io/IStream.h" #include diff --git a/src/lib/deskflow/App.cpp b/src/lib/deskflow/App.cpp index 0a10882082..cac410a91d 100644 --- a/src/lib/deskflow/App.cpp +++ b/src/lib/deskflow/App.cpp @@ -14,8 +14,8 @@ #include "common/constants.h" #include "deskflow/ArgsBase.h" #include "deskflow/Config.h" +#include "deskflow/ProtocolTypes.h" #include "deskflow/XDeskflow.h" -#include "deskflow/protocol_types.h" #if SYSAPI_WIN32 #include "base/IEventQueue.h" diff --git a/src/lib/deskflow/CMakeLists.txt b/src/lib/deskflow/CMakeLists.txt index 789f4c98d0..98d48524e3 100644 --- a/src/lib/deskflow/CMakeLists.txt +++ b/src/lib/deskflow/CMakeLists.txt @@ -125,8 +125,8 @@ add_library(${lib_name} STATIC ${PLATFORM_CODE} PacketStreamFilter.h PlatformScreen.cpp PlatformScreen.h - protocol_types.cpp - protocol_types.h + ProtocolTypes.cpp + ProtocolTypes.h ProtocolUtil.cpp ProtocolUtil.h Screen.cpp diff --git a/src/lib/deskflow/ClientApp.cpp b/src/lib/deskflow/ClientApp.cpp index ef95cd6195..5e60e0c1fc 100644 --- a/src/lib/deskflow/ClientApp.cpp +++ b/src/lib/deskflow/ClientApp.cpp @@ -16,9 +16,9 @@ #include "common/constants.h" #include "deskflow/ArgParser.h" #include "deskflow/ClientArgs.h" +#include "deskflow/ProtocolTypes.h" #include "deskflow/Screen.h" #include "deskflow/XScreen.h" -#include "deskflow/protocol_types.h" #include "net/NetworkAddress.h" #include "net/SocketMultiplexer.h" #include "net/TCPSocketFactory.h" diff --git a/src/lib/deskflow/ClipboardChunk.cpp b/src/lib/deskflow/ClipboardChunk.cpp index dd30f8ca57..4aeaef40d8 100644 --- a/src/lib/deskflow/ClipboardChunk.cpp +++ b/src/lib/deskflow/ClipboardChunk.cpp @@ -8,8 +8,8 @@ #include "base/Log.h" #include "base/String.h" +#include "deskflow/ProtocolTypes.h" #include "deskflow/ProtocolUtil.h" -#include "deskflow/protocol_types.h" #include "io/IStream.h" #include diff --git a/src/lib/deskflow/FileChunk.cpp b/src/lib/deskflow/FileChunk.cpp index eae1cec17a..2da3f3cc64 100644 --- a/src/lib/deskflow/FileChunk.cpp +++ b/src/lib/deskflow/FileChunk.cpp @@ -9,8 +9,8 @@ #include "base/Log.h" #include "base/Stopwatch.h" #include "base/String.h" +#include "deskflow/ProtocolTypes.h" #include "deskflow/ProtocolUtil.h" -#include "deskflow/protocol_types.h" #include "io/IStream.h" static const uint16_t kIntervalThreshold = 1; diff --git a/src/lib/deskflow/PacketStreamFilter.cpp b/src/lib/deskflow/PacketStreamFilter.cpp index e320ddd08c..3bcd5bbda8 100644 --- a/src/lib/deskflow/PacketStreamFilter.cpp +++ b/src/lib/deskflow/PacketStreamFilter.cpp @@ -8,7 +8,7 @@ #include "deskflow/PacketStreamFilter.h" #include "base/IEventQueue.h" #include "base/TMethodEventJob.h" -#include "deskflow/protocol_types.h" +#include "deskflow/ProtocolTypes.h" #include "mt/Lock.h" #include diff --git a/src/lib/deskflow/protocol_types.cpp b/src/lib/deskflow/ProtocolTypes.cpp similarity index 98% rename from src/lib/deskflow/protocol_types.cpp rename to src/lib/deskflow/ProtocolTypes.cpp index 53b163fabd..15e277e7f8 100644 --- a/src/lib/deskflow/protocol_types.cpp +++ b/src/lib/deskflow/ProtocolTypes.cpp @@ -5,7 +5,7 @@ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception */ -#include "deskflow/protocol_types.h" +#include "deskflow/ProtocolTypes.h" const char *const kSynergyProtocolName = "Synergy"; const char *const kBarrierProtocolName = "Barrier"; diff --git a/src/lib/deskflow/protocol_types.h b/src/lib/deskflow/ProtocolTypes.h similarity index 100% rename from src/lib/deskflow/protocol_types.h rename to src/lib/deskflow/ProtocolTypes.h diff --git a/src/lib/deskflow/ProtocolUtil.cpp b/src/lib/deskflow/ProtocolUtil.cpp index ee32d7e1ec..4ea3d35135 100644 --- a/src/lib/deskflow/ProtocolUtil.cpp +++ b/src/lib/deskflow/ProtocolUtil.cpp @@ -8,8 +8,8 @@ #include "deskflow/ProtocolUtil.h" #include "base/Log.h" #include "common/stdvector.h" +#include "deskflow/ProtocolTypes.h" #include "deskflow/XDeskflow.h" -#include "deskflow/protocol_types.h" #include "io/IStream.h" #include #include diff --git a/src/lib/deskflow/Screen.cpp b/src/lib/deskflow/Screen.cpp index 473602ac78..a9c92acc9d 100644 --- a/src/lib/deskflow/Screen.cpp +++ b/src/lib/deskflow/Screen.cpp @@ -10,7 +10,7 @@ #include "base/Log.h" #include "base/TMethodEventJob.h" #include "deskflow/IPlatformScreen.h" -#include "deskflow/protocol_types.h" +#include "deskflow/ProtocolTypes.h" #include "server/ClientProxy.h" namespace deskflow { diff --git a/src/lib/deskflow/StreamChunker.cpp b/src/lib/deskflow/StreamChunker.cpp index 9f5b413375..b827d8d422 100644 --- a/src/lib/deskflow/StreamChunker.cpp +++ b/src/lib/deskflow/StreamChunker.cpp @@ -15,7 +15,7 @@ #include "common/stdexcept.h" #include "deskflow/ClipboardChunk.h" #include "deskflow/FileChunk.h" -#include "deskflow/protocol_types.h" +#include "deskflow/ProtocolTypes.h" #include "mt/Lock.h" #include "mt/Mutex.h" diff --git a/src/lib/platform/MSWindowsHook.cpp b/src/lib/platform/MSWindowsHook.cpp index 24b44cf447..c974208e01 100644 --- a/src/lib/platform/MSWindowsHook.cpp +++ b/src/lib/platform/MSWindowsHook.cpp @@ -7,8 +7,8 @@ #include "platform/MSWindowsHook.h" #include "base/Log.h" +#include "deskflow/ProtocolTypes.h" #include "deskflow/XScreen.h" -#include "deskflow/protocol_types.h" static const char *g_name = "dfwhook"; diff --git a/src/lib/server/ClientProxy1_0.h b/src/lib/server/ClientProxy1_0.h index 4a8f3e0003..56fdccf6bd 100644 --- a/src/lib/server/ClientProxy1_0.h +++ b/src/lib/server/ClientProxy1_0.h @@ -8,7 +8,7 @@ #pragma once #include "deskflow/Clipboard.h" -#include "deskflow/protocol_types.h" +#include "deskflow/ProtocolTypes.h" #include "server/ClientProxy.h" class Event; diff --git a/src/lib/server/ClientProxyUnknown.cpp b/src/lib/server/ClientProxyUnknown.cpp index c888d150e2..8c66b54057 100644 --- a/src/lib/server/ClientProxyUnknown.cpp +++ b/src/lib/server/ClientProxyUnknown.cpp @@ -11,9 +11,9 @@ #include "base/Log.h" #include "base/TMethodEventJob.h" #include "deskflow/AppUtil.h" +#include "deskflow/ProtocolTypes.h" #include "deskflow/ProtocolUtil.h" #include "deskflow/XDeskflow.h" -#include "deskflow/protocol_types.h" #include "io/IStream.h" #include "io/XIO.h" #include "server/ClientProxy1_0.h" diff --git a/src/lib/server/Config.h b/src/lib/server/Config.h index 2a1b882c40..5e52856fcf 100644 --- a/src/lib/server/Config.h +++ b/src/lib/server/Config.h @@ -13,7 +13,7 @@ #include "common/stdset.h" #include "deskflow/IPlatformScreen.h" #include "deskflow/OptionTypes.h" -#include "deskflow/protocol_types.h" +#include "deskflow/ProtocolTypes.h" #include "net/NetworkAddress.h" #include "server/InputFilter.h" diff --git a/src/lib/server/InputFilter.h b/src/lib/server/InputFilter.h index 329e367f5c..14aba35829 100644 --- a/src/lib/server/InputFilter.h +++ b/src/lib/server/InputFilter.h @@ -12,7 +12,7 @@ #include "deskflow/IPlatformScreen.h" #include "deskflow/KeyTypes.h" #include "deskflow/MouseTypes.h" -#include "deskflow/protocol_types.h" +#include "deskflow/ProtocolTypes.h" class PrimaryClient; class Event; diff --git a/src/lib/server/PrimaryClient.h b/src/lib/server/PrimaryClient.h index 6ac8fb99ee..8441424517 100644 --- a/src/lib/server/PrimaryClient.h +++ b/src/lib/server/PrimaryClient.h @@ -7,7 +7,7 @@ #pragma once -#include "deskflow/protocol_types.h" +#include "deskflow/ProtocolTypes.h" #include "server/BaseClientProxy.h" namespace deskflow { diff --git a/src/lib/server/Server.cpp b/src/lib/server/Server.cpp index 8dbb58eb5a..29043485c9 100644 --- a/src/lib/server/Server.cpp +++ b/src/lib/server/Server.cpp @@ -19,10 +19,10 @@ #include "deskflow/IPlatformScreen.h" #include "deskflow/OptionTypes.h" #include "deskflow/PacketStreamFilter.h" +#include "deskflow/ProtocolTypes.h" #include "deskflow/Screen.h" #include "deskflow/StreamChunker.h" #include "deskflow/XDeskflow.h" -#include "deskflow/protocol_types.h" #include "mt/Thread.h" #include "net/TCPSocket.h" #include "server/ClientListener.h" diff --git a/src/test/unittests/deskflow/ClipboardChunkTests.cpp b/src/test/unittests/deskflow/ClipboardChunkTests.cpp index 512f7191ba..ea36f3f1fe 100644 --- a/src/test/unittests/deskflow/ClipboardChunkTests.cpp +++ b/src/test/unittests/deskflow/ClipboardChunkTests.cpp @@ -5,7 +5,7 @@ */ #include "deskflow/ClipboardChunk.h" -#include "deskflow/protocol_types.h" +#include "deskflow/ProtocolTypes.h" #include