From 973b98117c5a86af7257eecc38663a96e3b7f2d4 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Mon, 29 May 2023 06:47:59 +0300
Subject: [PATCH] generic: adjust

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 karchivemanager/CMakeLists.txt           |  2 ++
 kcachegrind/CMakeLists.txt               |  1 -
 kcachegrind/kcachegrind/configdlgbase.ui |  1 -
 kgpg/CMakeLists.txt                      |  2 ++
 kgpg/kgpgwidget.ui                       |  1 -
 kimageviewer/kimageui.ui                 |  1 -
 kman/CMakeLists.txt                      |  2 +-
 kman/kman.ui                             |  1 -
 kman/kmanmainwindow.cpp                  | 14 ++++++++------
 ksnapshot/ksnapshotwidget.ui             |  1 -
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/karchivemanager/CMakeLists.txt b/karchivemanager/CMakeLists.txt
index 8e8c9796..9c77b7d8 100644
--- a/karchivemanager/CMakeLists.txt
+++ b/karchivemanager/CMakeLists.txt
@@ -1,6 +1,8 @@
 project(karchivemanager)
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+    include(FeatureSummary)
+
     find_package(KDE4 4.19.0 REQUIRED)
     include(KDE4Defaults)
     include_directories(${KDE4_INCLUDES})
diff --git a/kcachegrind/CMakeLists.txt b/kcachegrind/CMakeLists.txt
index e9130a14..d26245de 100644
--- a/kcachegrind/CMakeLists.txt
+++ b/kcachegrind/CMakeLists.txt
@@ -4,7 +4,6 @@ project(kcachegrind)
 
 find_package(KDE4 4.14.3 REQUIRED)
 include(KDE4Defaults)
-include(MacroLibrary)
 
 set( CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} -DQT_STRICT_ITERATORS )
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
diff --git a/kcachegrind/kcachegrind/configdlgbase.ui b/kcachegrind/kcachegrind/configdlgbase.ui
index b70cd64c..9661a3c7 100644
--- a/kcachegrind/kcachegrind/configdlgbase.ui
+++ b/kcachegrind/kcachegrind/configdlgbase.ui
@@ -465,7 +465,6 @@
   <tabstop>buttonBox</tabstop>
   <tabstop>dirList</tabstop>
  </tabstops>
- <resources/>
  <connections>
   <connection>
    <sender>classCheck</sender>
diff --git a/kgpg/CMakeLists.txt b/kgpg/CMakeLists.txt
index a0d5fb7b..0e356492 100644
--- a/kgpg/CMakeLists.txt
+++ b/kgpg/CMakeLists.txt
@@ -1,6 +1,8 @@
 project(kgpg)
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+    include(FeatureSummary)
+
     find_package(KDE4 4.21.0 REQUIRED)
     include(KDE4Defaults)
     include_directories(${KDE4_INCLUDES})
diff --git a/kgpg/kgpgwidget.ui b/kgpg/kgpgwidget.ui
index c916fee0..516d06ac 100644
--- a/kgpg/kgpgwidget.ui
+++ b/kgpg/kgpgwidget.ui
@@ -402,6 +402,5 @@
    <header>kurlrequester.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
  <connections/>
 </ui>
diff --git a/kimageviewer/kimageui.ui b/kimageviewer/kimageui.ui
index 58e85568..46fd3476 100644
--- a/kimageviewer/kimageui.ui
+++ b/kimageviewer/kimageui.ui
@@ -206,6 +206,5 @@
    </item>
   </layout>
  </widget>
- <resources/>
  <connections/>
 </ui>
diff --git a/kman/CMakeLists.txt b/kman/CMakeLists.txt
index 2a3596b8..974c9db5 100644
--- a/kman/CMakeLists.txt
+++ b/kman/CMakeLists.txt
@@ -13,7 +13,7 @@ set(kman_sources
 )
 
 add_executable(kman ${kman_sources})
-target_link_libraries(kman ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS})
+target_link_libraries(kman ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KARCHIVE_LIBS})
 
 install(TARGETS kman DESTINATION ${KDE4_BIN_INSTALL_DIR})
 install(FILES kmanui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kman)
diff --git a/kman/kman.ui b/kman/kman.ui
index 9ce7bcc8..816368cf 100644
--- a/kman/kman.ui
+++ b/kman/kman.ui
@@ -82,6 +82,5 @@
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
  </widget>
- <resources/>
  <connections/>
 </ui>
diff --git a/kman/kmanmainwindow.cpp b/kman/kmanmainwindow.cpp
index a498b3c1..99883fe7 100644
--- a/kman/kmanmainwindow.cpp
+++ b/kman/kmanmainwindow.cpp
@@ -23,7 +23,7 @@
 #include <KDebug>
 #include <KStatusBar>
 #include <KFileDialog>
-#include <KFilterDev>
+#include <KDecompressor>
 #include <QThread>
 #include <QFileSystemWatcher>
 #include <QFileInfo>
@@ -369,12 +369,14 @@ QString KManMainWindow::manContent(const QString &path) {
 
     QByteArray content;
     if (path.endsWith(".gz") || path.endsWith(".bz2") || path.endsWith(".xz")) {
-        QIODevice *archivedevice = KFilterDev::deviceForFile(path);
-        if (archivedevice) {
-            if (archivedevice->open(QFile::ReadOnly)) {
-                content = archivedevice->readAll();
+        if (pathfile.open(QFile::ReadOnly)) {
+            QByteArray compressedcontent = pathfile.readAll();
+            KDecompressor kdecompressor;
+            kdecompressor.setType(KDecompressor::typeForFile(path));
+            if (!kdecompressor.process(compressedcontent)) {
+                kWarning() << kdecompressor.errorString();
             }
-            archivedevice->deleteLater();
+            content = kdecompressor.result();
         }
     } else {
         if (pathfile.open(QFile::ReadOnly)) {
diff --git a/ksnapshot/ksnapshotwidget.ui b/ksnapshot/ksnapshotwidget.ui
index db672d09..e60c7da5 100644
--- a/ksnapshot/ksnapshotwidget.ui
+++ b/ksnapshot/ksnapshotwidget.ui
@@ -217,6 +217,5 @@
    <header>knuminput.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
  <connections/>
 </ui>