chore: remove USE_KWAYLAND option

now use DWayland instead, it is not useful anymore Log:
linuxdeepin · Jul 19, 2023 · 6199c66 · 6199c66
1 parent c04cfab
commit 6199c66
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 36 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -46,20 +46,6 @@ find_package(DWayland REQUIRED)
 
 pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-qt)
 
-try_compile(USE_DEEPIN_KF5_WAYLAND
-              ${CMAKE_CURRENT_BINARY_DIR}/try_compile
-            SOURCES
-              ${CMAKE_CURRENT_SOURCE_DIR}/tests/kf5_wayland_test.cc
-            LINK_LIBRARIES
-              DWaylandClient
-)
-
-message(STATUS "USE_DEEPIN_KF5_WAYLAND ${USE_DEEPIN_KF5_WAYLAND}")
-
-if(USE_DEEPIN_KF5_WAYLAND)
-  add_definitions(-DUSE_DEEPIN_KF5_WAYLAND)
-endif()
-
 find_package(DtkTools REQUIRED)
 function(generation_dbus_adaptor xml class_name class_file option)
     execute_process(COMMAND qdbusxml2cpp ${option} -a ${class_file} -c ${class_name} ${xml}

diff --git a/dde-clipboard-daemon/clipboardloader.cpp b/dde-clipboard-daemon/clipboardloader.cpp
@@ -84,21 +84,15 @@ QString ClipboardLoader::m_pixPath;
 ClipboardLoader::ClipboardLoader(QObject *parent)
     : QObject(parent)
     , m_board(nullptr)
-#ifdef USE_DEEPIN_KF5_WAYLAND
     , m_waylandCopyClient(nullptr)
-#endif
 {
     if (qEnvironmentVariable("XDG_SESSION_TYPE").contains("wayland")) {
-#ifdef USE_DEEPIN_KF5_WAYLAND
         m_waylandCopyClient = new WaylandCopyClient(this);
         m_waylandCopyClient->init();
 
         connect(m_waylandCopyClient, &WaylandCopyClient::dataChanged, this, [this] {
             this->doWork(WAYLAND_PROTOCOL);
         });
-#else
-        qWarning() << "we will not work with wayland";
-#endif
     } else {
         m_board = qApp->clipboard();
         connect(m_board, &QClipboard::dataChanged, this, [this] {
@@ -135,10 +129,9 @@ void ClipboardLoader::dataReborned(const QByteArray &buf)
 
     if (m_board)
         m_board->setMimeData(mimeData);
-#ifdef USE_DEEPIN_KF5_WAYLAND
+
     if (m_waylandCopyClient)
         m_waylandCopyClient->setMimeData(mimeData);
-#endif
 }
 
 void ClipboardLoader::doWork(int protocolType)
@@ -150,11 +143,7 @@ void ClipboardLoader::doWork(int protocolType)
     // The pointer returned might become invalidated when the contents
     // of the clipboard changes; either by calling one of the setter functions
     // or externally by the system clipboard changing.`
-#ifdef USE_DEEPIN_KF5_WAYLAND
     const QMimeData *mimeData = protocolType == WAYLAND_PROTOCOL ? m_waylandCopyClient->mimeData() : m_board->mimeData();
-#else
-    const QMimeData *mimeData = m_board->mimeData();
-#endif
     if (!mimeData || mimeData->formats().isEmpty())
         return;
 

diff --git a/dde-clipboard-daemon/clipboardloader.h b/dde-clipboard-daemon/clipboardloader.h
@@ -46,9 +46,7 @@ private Q_SLOTS:
     QClipboard *m_board;
     QByteArray m_lastTimeStamp;
     QPixmap m_lastPix;
-#ifdef USE_DEEPIN_KF5_WAYLAND
     WaylandCopyClient *m_waylandCopyClient;
-#endif
 
     static QString m_pixPath;
 };

diff --git a/dde-clipboard-daemon/waylandcopyclient.cpp b/dde-clipboard-daemon/waylandcopyclient.cpp
@@ -2,7 +2,6 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#ifdef USE_DEEPIN_KF5_WAYLAND
 #include "waylandcopyclient.h"
 #include "readpipedatatask.h"
 
@@ -316,5 +315,3 @@ QStringList WaylandCopyClient::filterMimeType(const QStringList &mimeTypeList)
 
     return tmpList;
 }
-
-#endif
diff --git a/dde-clipboard-daemon/waylandcopyclient.h b/dde-clipboard-daemon/waylandcopyclient.h
@@ -2,7 +2,6 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#ifdef USE_DEEPIN_KF5_WAYLAND
 #ifndef COPYCLIENT_H
 #define COPYCLIENT_H
 
@@ -89,4 +88,3 @@ protected slots:
 };
 
 #endif // COPYCLIENT_H
-#endif
diff --git a/debian/rules b/debian/rules
@@ -5,6 +5,3 @@ export QT_SELECT = qt5
 
 %:
 	dh $@ --parallel
-
-override_dh_auto_configure:
-	dh_auto_configure -- -D USE_DEEPIN_KF5_WAYLAND=ON