From 6ab1579d38e7945ea32de8671a76b57ede9657c1 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Mon, 3 Nov 2025 21:12:25 -0500 Subject: [PATCH] refactor: Log remove unneeded includes --- src/lib/base/Log.cpp | 2 -- src/lib/base/Log.h | 8 ++++---- src/lib/deskflow/DaemonApp.cpp | 1 + src/lib/deskflow/win32/AppUtilWindows.cpp | 1 + src/lib/platform/MSWindowsDesks.cpp | 1 + src/lib/platform/OSXScreen.mm | 1 + src/lib/server/ClientListener.cpp | 1 + src/unittests/base/LogTests.cpp | 1 - src/unittests/base/LogTests.h | 1 - src/unittests/base/UnicodeTests.cpp | 1 - src/unittests/base/UnicodeTests.h | 1 - src/unittests/deskflow/ClipboardTests.cpp | 1 - src/unittests/deskflow/ClipboardTests.h | 1 - src/unittests/deskflow/IKeyStateTests.h | 6 ------ src/unittests/deskflow/KeyMapTests.h | 1 - src/unittests/deskflow/LanguageManagerTests.cpp | 1 - src/unittests/deskflow/LanguageManagerTests.h | 1 - src/unittests/deskflow/X11LayoutParserTests.h | 1 - src/unittests/platform/MSWindowsClipboardTests.cpp | 1 - src/unittests/platform/MSWindowsClipboardTests.h | 1 - src/unittests/platform/OSXClipboardTests.h | 1 - src/unittests/platform/OSXKeyStateTests.h | 1 + src/unittests/platform/XWindowsClipboardTests.h | 1 - 23 files changed, 10 insertions(+), 26 deletions(-) diff --git a/src/lib/base/Log.cpp b/src/lib/base/Log.cpp index 81c7adec1..4a92b966e 100644 --- a/src/lib/base/Log.cpp +++ b/src/lib/base/Log.cpp @@ -6,10 +6,8 @@ */ #include "base/Log.h" -#include "arch/Arch.h" #include "base/LogLevel.h" #include "base/LogOutputters.h" -#include "common/Common.h" #include "common/Constants.h" #include diff --git a/src/lib/base/Log.h b/src/lib/base/Log.h index f5b47893e..8fbfb42f8 100644 --- a/src/lib/base/Log.h +++ b/src/lib/base/Log.h @@ -7,13 +7,13 @@ #pragma once -#include - -#include "arch/Arch.h" -#include "arch/IArchMultithread.h" +#include "LogLevel.h" +#include #include +#include + #define CLOG (Log::getInstance()) #define BYE "\nTry `%s --help' for more information." diff --git a/src/lib/deskflow/DaemonApp.cpp b/src/lib/deskflow/DaemonApp.cpp index 718c71c60..e86bf07b5 100644 --- a/src/lib/deskflow/DaemonApp.cpp +++ b/src/lib/deskflow/DaemonApp.cpp @@ -6,6 +6,7 @@ #include "deskflow/DaemonApp.h" +#include "arch/Arch.h" #include "base/IEventQueue.h" #include "base/Log.h" #include "base/LogOutputters.h" diff --git a/src/lib/deskflow/win32/AppUtilWindows.cpp b/src/lib/deskflow/win32/AppUtilWindows.cpp index 70c9316ce..b40a9c677 100644 --- a/src/lib/deskflow/win32/AppUtilWindows.cpp +++ b/src/lib/deskflow/win32/AppUtilWindows.cpp @@ -7,6 +7,7 @@ #include "deskflow/win32/AppUtilWindows.h" +#include "arch/Arch.h" #include "arch/ArchException.h" #include "arch/win32/ArchMiscWindows.h" #include "arch/win32/XArchWindows.h" diff --git a/src/lib/platform/MSWindowsDesks.cpp b/src/lib/platform/MSWindowsDesks.cpp index 3883b6c8a..606009a38 100644 --- a/src/lib/platform/MSWindowsDesks.cpp +++ b/src/lib/platform/MSWindowsDesks.cpp @@ -8,6 +8,7 @@ #include "platform/MSWindowsDesks.h" +#include "arch/Arch.h" #include "base/IEventQueue.h" #include "base/IJob.h" #include "base/Log.h" diff --git a/src/lib/platform/OSXScreen.mm b/src/lib/platform/OSXScreen.mm index 9f25a4bd2..c6aec907f 100644 --- a/src/lib/platform/OSXScreen.mm +++ b/src/lib/platform/OSXScreen.mm @@ -8,6 +8,7 @@ #include "platform/OSXScreen.h" +#include "arch/Arch.h" #include "arch/ArchException.h" #include "base/EventQueue.h" #include "base/IEventQueue.h" diff --git a/src/lib/server/ClientListener.cpp b/src/lib/server/ClientListener.cpp index 76472ce26..1ffee6184 100644 --- a/src/lib/server/ClientListener.cpp +++ b/src/lib/server/ClientListener.cpp @@ -9,6 +9,7 @@ #include "server/ClientListener.h" #include "server/Server.h" +#include "arch/Arch.h" #include "base/IEventQueue.h" #include "base/Log.h" #include "deskflow/PacketStreamFilter.h" diff --git a/src/unittests/base/LogTests.cpp b/src/unittests/base/LogTests.cpp index b196b39a9..9ed35df94 100644 --- a/src/unittests/base/LogTests.cpp +++ b/src/unittests/base/LogTests.cpp @@ -24,7 +24,6 @@ QString sanitizeBuffer(const std::stringstream &in) void LogTests::initTestCase() { - m_arch.init(); m_log.setFilter(LogLevel::Debug2); } diff --git a/src/unittests/base/LogTests.h b/src/unittests/base/LogTests.h index fe25f26b7..2133846dd 100644 --- a/src/unittests/base/LogTests.h +++ b/src/unittests/base/LogTests.h @@ -23,6 +23,5 @@ private Q_SLOTS: void printErrWithFileAndLine(); private: - Arch m_arch; Log m_log; }; diff --git a/src/unittests/base/UnicodeTests.cpp b/src/unittests/base/UnicodeTests.cpp index fef1d445e..20fd8547c 100644 --- a/src/unittests/base/UnicodeTests.cpp +++ b/src/unittests/base/UnicodeTests.cpp @@ -11,7 +11,6 @@ void UnicodeTests::initTestCase() { - m_arch.init(); m_log.setFilter(LogLevel::Debug2); } diff --git a/src/unittests/base/UnicodeTests.h b/src/unittests/base/UnicodeTests.h index 899a39f30..bd3190864 100644 --- a/src/unittests/base/UnicodeTests.h +++ b/src/unittests/base/UnicodeTests.h @@ -17,6 +17,5 @@ private Q_SLOTS: void UTF16ToUTF8(); private: - Arch m_arch; Log m_log; }; diff --git a/src/unittests/deskflow/ClipboardTests.cpp b/src/unittests/deskflow/ClipboardTests.cpp index 7827c3a9c..33287376e 100644 --- a/src/unittests/deskflow/ClipboardTests.cpp +++ b/src/unittests/deskflow/ClipboardTests.cpp @@ -12,7 +12,6 @@ void ClipboardTests::initTestCase() { - m_arch.init(); m_log.setFilter(LogLevel::Debug2); } diff --git a/src/unittests/deskflow/ClipboardTests.h b/src/unittests/deskflow/ClipboardTests.h index ce58424eb..20e5abc68 100644 --- a/src/unittests/deskflow/ClipboardTests.h +++ b/src/unittests/deskflow/ClipboardTests.h @@ -28,6 +28,5 @@ private Q_SLOTS: private: const std::string kTestString1 = "deskflow rocks"; const std::string kTestString2 = "String 020"; - Arch m_arch; Log m_log; }; diff --git a/src/unittests/deskflow/IKeyStateTests.h b/src/unittests/deskflow/IKeyStateTests.h index 6fb545c3e..8fd3ae467 100644 --- a/src/unittests/deskflow/IKeyStateTests.h +++ b/src/unittests/deskflow/IKeyStateTests.h @@ -4,8 +4,6 @@ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception */ -#include "base/Log.h" - #include class IKeyStateTests : public QObject @@ -13,8 +11,4 @@ class IKeyStateTests : public QObject Q_OBJECT private Q_SLOTS: void allocDestination(); - -private: - Arch m_arch; - Log m_log; }; diff --git a/src/unittests/deskflow/KeyMapTests.h b/src/unittests/deskflow/KeyMapTests.h index beece9395..3e9b4c900 100644 --- a/src/unittests/deskflow/KeyMapTests.h +++ b/src/unittests/deskflow/KeyMapTests.h @@ -23,7 +23,6 @@ private Q_SLOTS: void mapkey(); private: - Arch m_arch; Log m_log; }; } // namespace deskflow diff --git a/src/unittests/deskflow/LanguageManagerTests.cpp b/src/unittests/deskflow/LanguageManagerTests.cpp index 1985055c6..4f1464f1e 100644 --- a/src/unittests/deskflow/LanguageManagerTests.cpp +++ b/src/unittests/deskflow/LanguageManagerTests.cpp @@ -11,7 +11,6 @@ void LanguageManagerTests::initTestCase() { - m_arch.init(); m_log.setFilter(LogLevel::Debug2); } diff --git a/src/unittests/deskflow/LanguageManagerTests.h b/src/unittests/deskflow/LanguageManagerTests.h index f4b1f097a..9816c8b6a 100644 --- a/src/unittests/deskflow/LanguageManagerTests.h +++ b/src/unittests/deskflow/LanguageManagerTests.h @@ -21,6 +21,5 @@ private Q_SLOTS: void languageInstall(); private: - Arch m_arch; Log m_log; }; diff --git a/src/unittests/deskflow/X11LayoutParserTests.h b/src/unittests/deskflow/X11LayoutParserTests.h index 36c68e4e4..0211d38ba 100644 --- a/src/unittests/deskflow/X11LayoutParserTests.h +++ b/src/unittests/deskflow/X11LayoutParserTests.h @@ -18,7 +18,6 @@ private Q_SLOTS: void convertLayouts(); private: - Arch m_arch; Log m_log; const QString kTestDir = "tmp/test"; const QString kTestCorrectFile = "tmp/test/correctEvdev.xml"; diff --git a/src/unittests/platform/MSWindowsClipboardTests.cpp b/src/unittests/platform/MSWindowsClipboardTests.cpp index b60573d07..3c9ddd882 100644 --- a/src/unittests/platform/MSWindowsClipboardTests.cpp +++ b/src/unittests/platform/MSWindowsClipboardTests.cpp @@ -12,7 +12,6 @@ void MSWindowsClipboardTests::initTestCase() { - m_arch.init(); m_log.setFilter(LogLevel::Debug2); MSWindowsClipboard clipboard(NULL); diff --git a/src/unittests/platform/MSWindowsClipboardTests.h b/src/unittests/platform/MSWindowsClipboardTests.h index 4fd990001..483ffdc0a 100644 --- a/src/unittests/platform/MSWindowsClipboardTests.h +++ b/src/unittests/platform/MSWindowsClipboardTests.h @@ -30,7 +30,6 @@ private Q_SLOTS: void isOwnedByDeskflow(); private: - Arch m_arch; Log m_log; const std::string m_testString = "deskflow test string"; const std::string m_testString2 = "Another String"; diff --git a/src/unittests/platform/OSXClipboardTests.h b/src/unittests/platform/OSXClipboardTests.h index 11c21280f..a16a648ef 100644 --- a/src/unittests/platform/OSXClipboardTests.h +++ b/src/unittests/platform/OSXClipboardTests.h @@ -17,7 +17,6 @@ private Q_SLOTS: void formatConvert_UTF8(); private: - Arch m_arch; Log m_log; const std::string m_testString = "deskflow test string"; }; diff --git a/src/unittests/platform/OSXKeyStateTests.h b/src/unittests/platform/OSXKeyStateTests.h index 8e539ced4..bc21a7d52 100644 --- a/src/unittests/platform/OSXKeyStateTests.h +++ b/src/unittests/platform/OSXKeyStateTests.h @@ -5,6 +5,7 @@ */ #include "base/Log.h" +#include "arch/Arch.h" #include "platform/OSXKeyState.h" #include diff --git a/src/unittests/platform/XWindowsClipboardTests.h b/src/unittests/platform/XWindowsClipboardTests.h index 8f406f4c9..e7a698c4e 100644 --- a/src/unittests/platform/XWindowsClipboardTests.h +++ b/src/unittests/platform/XWindowsClipboardTests.h @@ -26,7 +26,6 @@ private Q_SLOTS: void singleFormat(); #endif private: - Arch m_arch; Log m_log; #if !WINAPI_LIBEI && !WINAPI_PORTAL const std::string m_testString = "deskflow test string";