chore: move platform/Wayland.h -> common/PlatformInfo.h

src/lib/common/CMakeLists.txt

@@ -16,6 +16,7 @@ add_library(common STATIC
   ExitCodes.h
   I18N.h
   I18N.cpp
+  PlatformInfo.h
   Settings.h
   Settings.cpp
   QSettingsProxy.cpp

src/lib/deskflow/ClientApp.cpp

@@ -13,6 +13,7 @@
 #include "base/Log.h"
 #include "client/Client.h"
 #include "common/ExitCodes.h"
+#include "common/PlatformInfo.h"
 #include "common/Settings.h"
 #include "deskflow/Screen.h"
 #include "deskflow/ScreenException.h"
@@ -20,7 +21,6 @@
 #include "net/SocketException.h"
 #include "net/SocketMultiplexer.h"
 #include "net/TCPSocketFactory.h"
-#include "platform/Wayland.h"
 
 #if SYSAPI_WIN32
 #include "arch/win32/ArchMiscWindows.h"
@@ -47,10 +47,6 @@
 #include "platform/OSXScreen.h"
 #endif
 
-#if defined(WINAPI_XWINDOWS) or defined(WINAPI_LIBEI)
-#include "platform/Wayland.h"
-#endif
-
 #include <memory>
 
 constexpr static auto s_retryTime = 1.0;

src/lib/deskflow/ServerApp.cpp

@@ -13,6 +13,7 @@
 #include "base/Log.h"
 #include "base/Path.h"
 #include "common/ExitCodes.h"
+#include "common/PlatformInfo.h"
 #include "common/Settings.h"
 #include "deskflow/App.h"
 #include "deskflow/Screen.h"
@@ -52,10 +53,6 @@
 #include "platform/OSXScreen.h"
 #endif
 
-#if defined(WINAPI_XWINDOWS) or defined(WINAPI_LIBEI)
-#include "platform/Wayland.h"
-#endif
-
 #include <fstream>
 
 using namespace deskflow::server;

src/lib/gui/MainWindow.cpp

@@ -19,6 +19,7 @@
 #include "dialogs/SettingsDialog.h"
 
 #include "base/String.h"
+#include "common/PlatformInfo.h"
 #include "common/Settings.h"
 #include "common/UrlConstants.h"
 #include "gui/Messages.h"
@@ -27,7 +28,6 @@
 #include "gui/ipc/DaemonIpcClient.h"
 #include "gui/widgets/LogDock.h"
 #include "net/FingerprintDatabase.h"
-#include "platform/Wayland.h"
 
 #if defined(Q_OS_LINUX)
 #include "Config.h"

src/lib/platform/CMakeLists.txt

@@ -152,7 +152,7 @@ endif()
 include_directories(${inc})
 
 # wayland.h is included to check for wayland support
-add_library(platform STATIC ${PLATFORM_SOURCES} Wayland.h)
+add_library(platform STATIC ${PLATFORM_SOURCES})
 
 target_link_libraries(platform client ${libs})
 

src/lib/platform/XDGPortalRegistry.h

@@ -11,7 +11,7 @@
 #include <QDBusReply>
 
 #include "common/Constants.h"
-#include "platform/Wayland.h"
+#include "common/PlatformInfo.h"
 
 namespace deskflow::platform {