From 7fdb26f2ea329d3b8b3646b4625431014a4aa180 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Tue, 6 Jan 2026 07:51:53 -0500 Subject: [PATCH] refactor: move deskflow/DaemonApp => apps/deskflow-daemon/DaemonApp --- src/apps/deskflow-daemon/CMakeLists.txt | 7 ++++++- src/{lib/deskflow => apps/deskflow-daemon}/DaemonApp.cpp | 2 +- src/{lib/deskflow => apps/deskflow-daemon}/DaemonApp.h | 0 src/apps/deskflow-daemon/deskflow-daemon.cpp | 3 ++- src/lib/deskflow/CMakeLists.txt | 2 -- 5 files changed, 9 insertions(+), 5 deletions(-) rename src/{lib/deskflow => apps/deskflow-daemon}/DaemonApp.cpp (99%) rename src/{lib/deskflow => apps/deskflow-daemon}/DaemonApp.h (100%) diff --git a/src/apps/deskflow-daemon/CMakeLists.txt b/src/apps/deskflow-daemon/CMakeLists.txt index 59a9d7c71..43a75ecd5 100644 --- a/src/apps/deskflow-daemon/CMakeLists.txt +++ b/src/apps/deskflow-daemon/CMakeLists.txt @@ -12,7 +12,12 @@ if(WIN32) set(EXE_ICON "IDI_DESKFLOW ICON DISCARDABLE \"${CMAKE_SOURCE_DIR}/src/apps/res/deskflow.ico\"") configure_file(${CMAKE_SOURCE_DIR}/src/apps/res/windows.rc.in ${target}.rc) - add_executable(${target} WIN32 ${target}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${target}.rc) + add_executable( + ${target} WIN32 + ${target}.cpp + DaemonApp.cpp + DaemonApp.h + ${CMAKE_CURRENT_BINARY_DIR}/${target}.rc) target_link_libraries( ${target} diff --git a/src/lib/deskflow/DaemonApp.cpp b/src/apps/deskflow-daemon/DaemonApp.cpp similarity index 99% rename from src/lib/deskflow/DaemonApp.cpp rename to src/apps/deskflow-daemon/DaemonApp.cpp index 905e8a965..05acb8c21 100644 --- a/src/lib/deskflow/DaemonApp.cpp +++ b/src/apps/deskflow-daemon/DaemonApp.cpp @@ -5,7 +5,7 @@ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception */ -#include "deskflow/DaemonApp.h" +#include "DaemonApp.h" #include "arch/Arch.h" #include "base/IEventQueue.h" diff --git a/src/lib/deskflow/DaemonApp.h b/src/apps/deskflow-daemon/DaemonApp.h similarity index 100% rename from src/lib/deskflow/DaemonApp.h rename to src/apps/deskflow-daemon/DaemonApp.h diff --git a/src/apps/deskflow-daemon/deskflow-daemon.cpp b/src/apps/deskflow-daemon/deskflow-daemon.cpp index cce65a0cb..8d03f2084 100644 --- a/src/apps/deskflow-daemon/deskflow-daemon.cpp +++ b/src/apps/deskflow-daemon/deskflow-daemon.cpp @@ -5,13 +5,14 @@ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception */ +#include "DaemonApp.h" + #include "arch/Arch.h" #include "base/EventQueue.h" #include "base/Log.h" #include "common/ExitCodes.h" #include "common/Settings.h" #include "common/VersionInfo.h" -#include "deskflow/DaemonApp.h" #include "deskflow/ipc/DaemonIpcServer.h" #if SYSAPI_WIN32 diff --git a/src/lib/deskflow/CMakeLists.txt b/src/lib/deskflow/CMakeLists.txt index 24c3c123a..c3efa5afe 100644 --- a/src/lib/deskflow/CMakeLists.txt +++ b/src/lib/deskflow/CMakeLists.txt @@ -37,8 +37,6 @@ add_library(${lib_name} STATIC ${PLATFORM_CODE} Clipboard.h ClipboardChunk.cpp ClipboardChunk.h - DaemonApp.cpp - DaemonApp.h DeskflowException.cpp DeskflowException.h DisplayInvalidException.h