From: Jonathan Esk-Riddell <jr@jriddell.org>
Date: Fri, 10 Nov 2023 17:55:23 +0000 (+0000)
Subject: Port to KF6 rename of KUserFeedback
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/93237493e4ef0efa7d5840ffceec044e6946662c

Port to KF6 rename of KUserFeedback
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb7be4db2..51781cd3a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,13 +77,13 @@ find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS
     Codecs
 )
 
-find_package(KUserFeedbackQt6 1.2.1)
-set_package_properties(KUserFeedbackQt6
+find_package(KF6UserFeedback ${KF6_MIN_VERSION})
+set_package_properties(KF6UserFeedback
         PROPERTIES TYPE OPTIONAL
         PURPOSE "Used for submission of telemetry data"
         )
 
-if(KUserFeedbackQt6_FOUND)
+if(KF6UserFeedback_FOUND)
     set(HAVE_KUSERFEEDBACK TRUE)
 endif()
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5d04cbabe..be83cd2d0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -447,8 +447,8 @@ endif()
 if (HAVE_KUSERFEEDBACK)
     target_link_libraries(
         dolphinstatic
-        KUserFeedbackCoreQt6
-        KUserFeedbackWidgetsQt6
+        KF6::UserFeedbackCore
+        KF6::UserFeedbackWidgets
     )
 endif()
 
diff --git a/src/settings/userfeedback/userfeedbacksettingspage.cpp b/src/settings/userfeedback/userfeedbacksettingspage.cpp
index 7d87cb2fc..6c205acee 100644
--- a/src/settings/userfeedback/userfeedbacksettingspage.cpp
+++ b/src/settings/userfeedback/userfeedbacksettingspage.cpp
@@ -7,8 +7,8 @@
 #include "userfeedbacksettingspage.h"
 #include "userfeedback/dolphinfeedbackprovider.h"
 
-#include <KUserFeedbackQt6/FeedbackConfigWidget>
-#include <KUserFeedbackQt6/Provider>
+#include <KUserFeedback/FeedbackConfigWidget>
+#include <KUserFeedback/Provider>
 
 #include <QVBoxLayout>
 
diff --git a/src/userfeedback/dolphinfeedbackprovider.cpp b/src/userfeedback/dolphinfeedbackprovider.cpp
index f233fad46..19526dc4d 100644
--- a/src/userfeedback/dolphinfeedbackprovider.cpp
+++ b/src/userfeedback/dolphinfeedbackprovider.cpp
@@ -8,13 +8,13 @@
 #include "placesdatasource.h"
 #include "settingsdatasource.h"
 
-#include <KUserFeedbackQt6/ApplicationVersionSource>
-#include <KUserFeedbackQt6/LocaleInfoSource>
-#include <KUserFeedbackQt6/PlatformInfoSource>
-#include <KUserFeedbackQt6/QtVersionSource>
-#include <KUserFeedbackQt6/ScreenInfoSource>
-#include <KUserFeedbackQt6/StartCountSource>
-#include <KUserFeedbackQt6/UsageTimeSource>
+#include <KUserFeedback/ApplicationVersionSource>
+#include <KUserFeedback/LocaleInfoSource>
+#include <KUserFeedback/PlatformInfoSource>
+#include <KUserFeedback/QtVersionSource>
+#include <KUserFeedback/ScreenInfoSource>
+#include <KUserFeedback/StartCountSource>
+#include <KUserFeedback/UsageTimeSource>
 
 DolphinFeedbackProvider *DolphinFeedbackProvider::instance()
 {
diff --git a/src/userfeedback/dolphinfeedbackprovider.h b/src/userfeedback/dolphinfeedbackprovider.h
index 3b85c7eb3..8be2f81b6 100644
--- a/src/userfeedback/dolphinfeedbackprovider.h
+++ b/src/userfeedback/dolphinfeedbackprovider.h
@@ -7,7 +7,7 @@
 #ifndef DOLPHINFEEDBACKPROVIDER_H
 #define DOLPHINFEEDBACKPROVIDER_H
 
-#include <KUserFeedbackQt6/Provider>
+#include <KUserFeedback/Provider>
 
 class DolphinFeedbackProvider : public KUserFeedback::Provider
 {
diff --git a/src/userfeedback/placesdatasource.cpp b/src/userfeedback/placesdatasource.cpp
index 554194af7..cdbd5d757 100644
--- a/src/userfeedback/placesdatasource.cpp
+++ b/src/userfeedback/placesdatasource.cpp
@@ -8,7 +8,7 @@
 
 #include <KLocalizedString>
 #include <KMountPoint>
-#include <KUserFeedbackQt6/Provider>
+#include <KUserFeedback/Provider>
 #include <Solid/Device>
 #include <Solid/NetworkShare>
 #include <Solid/StorageAccess>
diff --git a/src/userfeedback/placesdatasource.h b/src/userfeedback/placesdatasource.h
index ad4c1725d..d4666af25 100644
--- a/src/userfeedback/placesdatasource.h
+++ b/src/userfeedback/placesdatasource.h
@@ -7,7 +7,7 @@
 #ifndef PLACESDATASOURCE_H
 #define PLACESDATASOURCE_H
 
-#include <KUserFeedbackQt6/AbstractDataSource>
+#include <KUserFeedback/AbstractDataSource>
 
 class DolphinMainWindow;
 
diff --git a/src/userfeedback/settingsdatasource.cpp b/src/userfeedback/settingsdatasource.cpp
index d14fc0dbd..c517793ad 100644
--- a/src/userfeedback/settingsdatasource.cpp
+++ b/src/userfeedback/settingsdatasource.cpp
@@ -9,7 +9,7 @@
 #include "dolphinmainwindow.h"
 
 #include <KLocalizedString>
-#include <KUserFeedbackQt6/Provider>
+#include <KUserFeedback/Provider>
 
 #include <QApplication>
 #include <QVariant>
diff --git a/src/userfeedback/settingsdatasource.h b/src/userfeedback/settingsdatasource.h
index cc843dec8..9804c78a7 100644
--- a/src/userfeedback/settingsdatasource.h
+++ b/src/userfeedback/settingsdatasource.h
@@ -7,7 +7,7 @@
 #ifndef SETTINGSDATASOURCE_H
 #define SETTINGSDATASOURCE_H
 
-#include <KUserFeedbackQt6/AbstractDataSource>
+#include <KUserFeedback/AbstractDataSource>
 
 class DolphinMainWindow;