Removed internal icon engine

It could interfere with the active icon engine. Fixes #788
lxqt · Feb 28, 2022 · 54712d7 · 54712d7
1 parent 86bf433
commit 54712d7
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 128 deletions.
diff --git a/src/core/iconinfo.cpp b/src/core/iconinfo.cpp
@@ -1,5 +1,4 @@
 #include "iconinfo.h"
-#include "iconinfo_p.h"
 #include <cstring>
 
 namespace Fm {
@@ -68,12 +67,7 @@ void IconInfo::updateQIcons() {
 
 QIcon IconInfo::qicon() const {
     if(Q_UNLIKELY(qicon_.isNull() && gicon_)) {
-        if(!G_IS_FILE_ICON(gicon_.get())) {
-            qicon_ = QIcon(new IconEngine{shared_from_this()});
-        }
-        else {
-            qicon_ = getFirst(internalQicons_);
-        }
+        qicon_ = internalQicon();
     }
     return qicon_;
 }

diff --git a/src/core/iconinfo.h b/src/core/iconinfo.h
@@ -39,7 +39,6 @@ namespace Fm {
 
 class LIBFM_QT_API IconInfo: public std::enable_shared_from_this<IconInfo> {
 public:
-    friend class IconEngine;
 
     explicit IconInfo() {}
 

diff --git a/src/core/iconinfo_p.h b/src/core/iconinfo_p.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,7 +39,6 @@ namespace Fm { @@
     class LIBFM_QT_API IconInfo: public std::enable_shared_from_this<IconInfo> {
     public:
-        friend class IconEngine;
         explicit IconInfo() {}
@@ Expand Down @@