From c63f00ec2a863a07e53ca03b8ca1a0c37fdc68a6 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Wed, 7 Jun 2023 03:08:08 +0300
Subject: [PATCH] kio: move KDynamicJobTracker to kdeui and export it as public
 class

to be used by kprintjobs and possibly more, also added camelcase header
for KUiServerJobTracker

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 includes/CMakeLists.txt                                       | 2 ++
 includes/KDynamicJobTracker                                   | 1 +
 includes/KUiServerJobTracker                                  | 1 +
 kdeui/CMakeLists.txt                                          | 2 ++
 {kio/kio => kdeui/jobs}/kdynamicjobtracker.cpp                | 4 ++--
 .../kdynamicjobtracker_p.h => kdeui/jobs/kdynamicjobtracker.h | 3 ++-
 kdeui/jobs/kuiserverjobtracker.h                              | 1 -
 kio/CMakeLists.txt                                            | 1 -
 kio/kio/global.cpp                                            | 2 +-
 9 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 includes/KDynamicJobTracker
 create mode 100644 includes/KUiServerJobTracker
 rename {kio/kio => kdeui/jobs}/kdynamicjobtracker.cpp (97%)
 rename kio/kio/kdynamicjobtracker_p.h => kdeui/jobs/kdynamicjobtracker.h (95%)

diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt
index 5aeafa8e..955f21e6 100644
--- a/includes/CMakeLists.txt
+++ b/includes/CMakeLists.txt
@@ -350,6 +350,8 @@ install(
     KFilterProxySearchLine
     KWidgetItemDelegate
     KWidgetJobTracker
+    KDynamicJobTracker
+    KUiServerJobTracker
     KPixmapSequence
     KPixmapSequenceWidget
     KPixmapSequenceOverlayPainter
diff --git a/includes/KDynamicJobTracker b/includes/KDynamicJobTracker
new file mode 100644
index 00000000..c75ca18b
--- /dev/null
+++ b/includes/KDynamicJobTracker
@@ -0,0 +1 @@
+#include "../kdynamicjobtracker.h"
diff --git a/includes/KUiServerJobTracker b/includes/KUiServerJobTracker
new file mode 100644
index 00000000..9c59614f
--- /dev/null
+++ b/includes/KUiServerJobTracker
@@ -0,0 +1 @@
+#include "../kuiserverjobtracker.h"
diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt
index 0ce41526..ad8a3c41 100644
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
@@ -143,6 +143,7 @@ set(kdeui_LIB_SRCS
     jobs/kwidgetjobtracker.cpp
     jobs/kstatusbarjobtracker.cpp
     jobs/kuiserverjobtracker.cpp
+    jobs/kdynamicjobtracker.cpp
     kernel/kapplication.cpp
     kernel/kclipboard.cpp
     kernel/kuniqueapplication.cpp
@@ -461,6 +462,7 @@ install(
     jobs/kwidgetjobtracker.h
     jobs/kstatusbarjobtracker.h
     jobs/kuiserverjobtracker.h
+    jobs/kdynamicjobtracker.h
     kernel/kapplication.h
     kernel/kuniqueapplication.h
     kernel/ksessionmanager.h
diff --git a/kio/kio/kdynamicjobtracker.cpp b/kdeui/jobs/kdynamicjobtracker.cpp
similarity index 97%
rename from kio/kio/kdynamicjobtracker.cpp
rename to kdeui/jobs/kdynamicjobtracker.cpp
index aa7a0fed..008b5bd4 100644
--- a/kio/kio/kdynamicjobtracker.cpp
+++ b/kdeui/jobs/kdynamicjobtracker.cpp
@@ -18,7 +18,7 @@
  * Boston, MA  02110-1301  USA
  */
 
-#include "kdynamicjobtracker_p.h"
+#include "kdynamicjobtracker.h"
 
 #include <kuiserverjobtracker.h>
 #include <kwidgetjobtracker.h>
@@ -108,4 +108,4 @@ void KDynamicJobTracker::unregisterJob(KJob *job)
         widgetTracker->unregisterJob(job);
 }
 
-#include "moc_kdynamicjobtracker_p.cpp"
+#include "moc_kdynamicjobtracker.cpp"
diff --git a/kio/kio/kdynamicjobtracker_p.h b/kdeui/jobs/kdynamicjobtracker.h
similarity index 95%
rename from kio/kio/kdynamicjobtracker_p.h
rename to kdeui/jobs/kdynamicjobtracker.h
index 240b5d0e..9d8039a2 100644
--- a/kio/kio/kdynamicjobtracker_p.h
+++ b/kdeui/jobs/kdynamicjobtracker.h
@@ -20,6 +20,7 @@
 #ifndef KDYNAMICJOBTRACKER_H
 #define KDYNAMICJOBTRACKER_H
 
+#include <kdeui_export.h>
 #include <kjobtrackerinterface.h>
 
 /**
@@ -28,7 +29,7 @@
  * available. This way, we have the old dialogs as fallback when the user doesn't use a kuiserver
  * applet or application.
  */
-class KDynamicJobTracker : public KJobTrackerInterface
+class KDEUI_EXPORT KDynamicJobTracker : public KJobTrackerInterface
 {
     Q_OBJECT
 
diff --git a/kdeui/jobs/kuiserverjobtracker.h b/kdeui/jobs/kuiserverjobtracker.h
index 957a2a76..59dc4d9f 100644
--- a/kdeui/jobs/kuiserverjobtracker.h
+++ b/kdeui/jobs/kuiserverjobtracker.h
@@ -14,7 +14,6 @@
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
-
 */
 
 #ifndef KUISERVERJOBTRACKER_H
diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt
index 20cd3aef..5c9ad198 100644
--- a/kio/CMakeLists.txt
+++ b/kio/CMakeLists.txt
@@ -44,7 +44,6 @@ set(kiocore_STAT_SRCS
     kio/kdirlister.cpp
     kio/kdirmodel.cpp
     kio/kdirnotify.cpp
-    kio/kdynamicjobtracker.cpp
     kio/kfileitem.cpp
     kio/kfileitemlistproperties.cpp
     kio/kfileitemactions.cpp
diff --git a/kio/kio/global.cpp b/kio/kio/global.cpp
index 651c2b01..bb6ec9bf 100644
--- a/kio/kio/global.cpp
+++ b/kio/kio/global.cpp
@@ -29,7 +29,7 @@
 #include <kiconloader.h>
 #include <kprotocolmanager.h>
 #include <kmimetype.h>
-#include <kdynamicjobtracker_p.h>
+#include <kdynamicjobtracker.h>
 
 #include <QtCore/QByteArray>
 #include <QtCore/qdatetime.h>