From 4553f8da1793d5fd86211facbbd31727f0d98123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E9=9D=99?= <tanjing@kylinos.cn>
Date: Thu, 21 Nov 2024 15:45:48 +0800
Subject: [PATCH] Remove Qt5Xdg

---
 debian/control                                |  2 --
 qt5-ukui-platformtheme/CMakeLists.txt         |  1 -
 ukui-qml-style-helper/CMakeLists.txt          | 10 ----------
 .../styleparameter/imageprovider.cpp          | 19 +------------------
 .../styleparameter/imageprovider.h            |  1 -
 5 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/debian/control b/debian/control
index 4ef0854..e2a1966 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,6 @@ Build-Depends: dbus-x11,
                libpeony-dev,
                libqt5svg5-dev,
                libqt5x11extras5-dev,
-               libqt5xdgiconloader-dev,
                peony,
                pkg-config,
                pkg-kde-tools,
@@ -42,7 +41,6 @@ Vcs-Browser: https://gitee.com/openkylin/qt5-ukui-platformtheme
 Package: qt5-ukui-platformtheme
 Architecture: any
 Depends: libqt5-ukui-style1 (= ${binary:Version}),
-         libqt5xdgiconloader3,
          qml-module-org-ukui-qqc2desktopstyle (= ${binary:Version}),
          qml-module-org-ukui-stylehelper (= ${binary:Version}),
          qt5-styles-ukui (= ${binary:Version}),
diff --git a/qt5-ukui-platformtheme/CMakeLists.txt b/qt5-ukui-platformtheme/CMakeLists.txt
index f0245a0..2041b41 100644
--- a/qt5-ukui-platformtheme/CMakeLists.txt
+++ b/qt5-ukui-platformtheme/CMakeLists.txt
@@ -65,7 +65,6 @@ find_package(X11)
 
 find_package(PkgConfig)
 pkg_check_modules(QGSETTINGS REQUIRED gsettings-qt)
-pkg_check_modules(REQUIRED Qt5XdgIconLoader)
 pkg_check_modules(REQUIRED kysdk-waylandhelper)
 pkg_check_modules(FONTCONFIG REQUIRED fontconfig)
 pkg_check_modules(FREETYPE2 REQUIRED freetype2)
diff --git a/ukui-qml-style-helper/CMakeLists.txt b/ukui-qml-style-helper/CMakeLists.txt
index 03ff714..d53a398 100644
--- a/ukui-qml-style-helper/CMakeLists.txt
+++ b/ukui-qml-style-helper/CMakeLists.txt
@@ -27,16 +27,6 @@ pkg_check_modules(FONTCONFIG REQUIRED fontconfig)
 pkg_check_modules(GLIB2 REQUIRED glib-2.0 gio-2.0 )
 
 set(EXTERNAL_LIBS "")
-set(PC_PKGS Qt5Xdg)
-
-foreach(PC_LIB IN ITEMS ${PC_PKGS})
-    pkg_check_modules(${PC_LIB} REQUIRED IMPORTED_TARGET ${PC_LIB})
-    if(${${PC_LIB}_FOUND})
-        include_directories(${${PC_LIB}_INCLUDE_DIRS})
-        link_directories(${${PC_LIB}_LIBRARY_DIRS})
-        list(APPEND EXTERNAL_LIBS PkgConfig::${PC_LIB})
-    endif()
-endforeach()
 
 include_directories(${GLIB2_INCLUDE_DIRS})
 include_directories(${Qsettings_INCLUDE_DIRS})
diff --git a/ukui-qml-style-helper/styleparameter/imageprovider.cpp b/ukui-qml-style-helper/styleparameter/imageprovider.cpp
index 7a2b444..dfb1f51 100644
--- a/ukui-qml-style-helper/styleparameter/imageprovider.cpp
+++ b/ukui-qml-style-helper/styleparameter/imageprovider.cpp
@@ -6,7 +6,6 @@
 #include <QApplication>
 #include <QPalette>
 #include <QSize>
-#include <qt5xdg/XdgIcon>
 #include <QColor>
 #include <QPainter>
 #include <qmath.h>
@@ -43,13 +42,7 @@ QIcon IconHelper::loadIcon(const QString &id)
             icon.addPixmap(pixmap);
         }
 
-    } else {
-        isOk = loadThemeIcon(id, icon);
-        if (!isOk) {
-            isOk = loadXdgIcon(id, icon);
-        }
     }
-
     if (!isOk) {
         loadDefaultIcon(icon);
     }
@@ -87,16 +80,6 @@ void IconHelper::loadDefaultIcon(QIcon &icon)
     }
 }
 
-bool IconHelper::loadXdgIcon(const QString &name, QIcon &icon)
-{
-    icon = XdgIcon::fromTheme(name);
-    if (icon.isNull()) {
-        qWarning() << "Error: loadXdgIcon, icon dose not exists. name:" << name;
-        return false;
-    }
-    return true;
-}
-
 // see: https://doc.qt.io/archives/qt-5.12/qurl.html#details
 QString IconHelper::toLocalPath(const QUrl &url)
 {
@@ -139,7 +122,7 @@ bool IconHelper::isRemoteServerFile(const QUrl &url)
 
 bool IconHelper::isThemeIcon(const QString &name)
 {
-    return QIcon::hasThemeIcon(name) || !XdgIcon::fromTheme(name).isNull();
+    return QIcon::hasThemeIcon(name);
 }
 
 bool IconHelper::isLocalFile(const QUrl &url)
diff --git a/ukui-qml-style-helper/styleparameter/imageprovider.h b/ukui-qml-style-helper/styleparameter/imageprovider.h
index e010ccf..6a5e3dd 100644
--- a/ukui-qml-style-helper/styleparameter/imageprovider.h
+++ b/ukui-qml-style-helper/styleparameter/imageprovider.h
@@ -68,7 +68,6 @@ public:
 
 private:
     static bool loadThemeIcon(const QString &name, QIcon &icon);
-    static bool loadXdgIcon(const QString &name, QIcon &icon);
     static void loadDefaultIcon(QIcon &icon);
     static QPixmap generatedDisablePixmap(QPixmap pixmap);
     static QPixmap generatedHightlightPixmap(QPixmap pixmap);