refactor: Log remove unneeded includes

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 <cstdarg>

src/lib/base/Log.h

@@ -7,13 +7,13 @@
 
 #pragma once
 
-#include <QString>
-
-#include "arch/Arch.h"
-#include "arch/IArchMultithread.h"
+#include "LogLevel.h"
 
+#include <list>
 #include <mutex>
 
+#include <QString>
+
 #define CLOG (Log::getInstance())
 #define BYE "\nTry `%s --help' for more information."
 

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"

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"

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"

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"

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"

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);
 }
 

src/unittests/base/LogTests.h

@@ -23,6 +23,5 @@ private Q_SLOTS:
   void printErrWithFileAndLine();
 
 private:
-  Arch m_arch;
   Log m_log;
 };

src/unittests/base/UnicodeTests.cpp

@@ -11,7 +11,6 @@
 
 void UnicodeTests::initTestCase()
 {
-  m_arch.init();
   m_log.setFilter(LogLevel::Debug2);
 }
 

src/unittests/base/UnicodeTests.h

@@ -17,6 +17,5 @@ private Q_SLOTS:
   void UTF16ToUTF8();
 
 private:
-  Arch m_arch;
   Log m_log;
 };

src/unittests/deskflow/ClipboardTests.cpp

@@ -12,7 +12,6 @@
 
 void ClipboardTests::initTestCase()
 {
-  m_arch.init();
   m_log.setFilter(LogLevel::Debug2);
 }
 

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;
 };

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 <QTest>
 
 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;
 };

src/unittests/deskflow/KeyMapTests.h

@@ -23,7 +23,6 @@ private Q_SLOTS:
   void mapkey();
 
 private:
-  Arch m_arch;
   Log m_log;
 };
 } // namespace deskflow

src/unittests/deskflow/LanguageManagerTests.cpp

@@ -11,7 +11,6 @@
 
 void LanguageManagerTests::initTestCase()
 {
-  m_arch.init();
   m_log.setFilter(LogLevel::Debug2);
 }
 

src/unittests/deskflow/LanguageManagerTests.h

@@ -21,6 +21,5 @@ private Q_SLOTS:
   void languageInstall();
 
 private:
-  Arch m_arch;
   Log m_log;
 };

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";

src/unittests/platform/MSWindowsClipboardTests.cpp

@@ -12,7 +12,6 @@
 
 void MSWindowsClipboardTests::initTestCase()
 {
-  m_arch.init();
   m_log.setFilter(LogLevel::Debug2);
 
   MSWindowsClipboard clipboard(NULL);

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";

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";
 };

src/unittests/platform/OSXKeyStateTests.h

@@ -5,6 +5,7 @@
  */
 #include "base/Log.h"
 
+#include "arch/Arch.h"
 #include "platform/OSXKeyState.h"
 
 #include <QTest>

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";