From b0413ed4ffb4d35ba3d31003a3028e173611a0ea Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sun, 10 May 2026 09:10:15 -0400 Subject: [PATCH] refactor: move base/LogLevel -> common/LogLevel --- src/lib/arch/IArchLog.h | 2 +- src/lib/base/CMakeLists.txt | 1 - src/lib/base/ILogOutputter.h | 2 +- src/lib/base/Log.cpp | 2 +- src/lib/base/Log.h | 2 +- src/lib/common/CMakeLists.txt | 1 + src/lib/{base => common}/LogLevel.h | 0 src/lib/platform/MSWindowsWatchdog.cpp | 2 +- src/unittests/platform/WlClipboardTests.cpp | 2 +- 9 files changed, 7 insertions(+), 7 deletions(-) rename src/lib/{base => common}/LogLevel.h (100%) diff --git a/src/lib/arch/IArchLog.h b/src/lib/arch/IArchLog.h index fc01496d8..fd70d96e4 100644 --- a/src/lib/arch/IArchLog.h +++ b/src/lib/arch/IArchLog.h @@ -10,7 +10,7 @@ #include -#include "base/LogLevel.h" +#include "common/LogLevel.h" //! Interface for architecture dependent logging /*! diff --git a/src/lib/base/CMakeLists.txt b/src/lib/base/CMakeLists.txt index fa812e520..57fe4fe50 100644 --- a/src/lib/base/CMakeLists.txt +++ b/src/lib/base/CMakeLists.txt @@ -25,7 +25,6 @@ add_library(base STATIC LogOutputters.h Log.cpp Log.h - LogLevel.h PriorityQueue.h SimpleEventQueueBuffer.cpp SimpleEventQueueBuffer.h diff --git a/src/lib/base/ILogOutputter.h b/src/lib/base/ILogOutputter.h index 048b194d6..9e3fda0e2 100644 --- a/src/lib/base/ILogOutputter.h +++ b/src/lib/base/ILogOutputter.h @@ -9,7 +9,7 @@ #pragma once #include "base/Log.h" -#include "base/LogLevel.h" +#include "common/LogLevel.h" //! Outputter interface /*! diff --git a/src/lib/base/Log.cpp b/src/lib/base/Log.cpp index 26b1daf95..66cdac530 100644 --- a/src/lib/base/Log.cpp +++ b/src/lib/base/Log.cpp @@ -6,9 +6,9 @@ */ #include "base/Log.h" -#include "base/LogLevel.h" #include "base/LogOutputters.h" #include "common/Constants.h" +#include "common/LogLevel.h" #include #include diff --git a/src/lib/base/Log.h b/src/lib/base/Log.h index 85cfc1311..38573faae 100644 --- a/src/lib/base/Log.h +++ b/src/lib/base/Log.h @@ -7,7 +7,7 @@ #pragma once -#include "LogLevel.h" +#include "common/LogLevel.h" #include #include diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt index a9c2f1bcf..b93a6fc87 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 + LogLevel.h NetworkProtocol.h PlatformInfo.h Settings.h diff --git a/src/lib/base/LogLevel.h b/src/lib/common/LogLevel.h similarity index 100% rename from src/lib/base/LogLevel.h rename to src/lib/common/LogLevel.h diff --git a/src/lib/platform/MSWindowsWatchdog.cpp b/src/lib/platform/MSWindowsWatchdog.cpp index aa1aea7b4..bb8c98e3f 100644 --- a/src/lib/platform/MSWindowsWatchdog.cpp +++ b/src/lib/platform/MSWindowsWatchdog.cpp @@ -9,10 +9,10 @@ #include "arch/Arch.h" #include "arch/win32/XArchWindows.h" #include "base/Log.h" -#include "base/LogLevel.h" #include "base/LogOutputters.h" #include "base/TMethodJob.h" #include "common/Constants.h" +#include "common/LogLevel.h" #include "deskflow/App.h" #include "mt/Thread.h" #include "platform/MSWindowsHandle.h" diff --git a/src/unittests/platform/WlClipboardTests.cpp b/src/unittests/platform/WlClipboardTests.cpp index 176945b9f..92f0fd088 100644 --- a/src/unittests/platform/WlClipboardTests.cpp +++ b/src/unittests/platform/WlClipboardTests.cpp @@ -6,7 +6,7 @@ #include "WlClipboardTests.h" -#include "base/LogLevel.h" +#include "common/LogLevel.h" #include "common/PlatformInfo.h" #include "deskflow/ClipboardTypes.h" #include "platform/WlClipboard.h"