Port to KF6 rename of KUserFeedback

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb7be4db22a7752a4e2c6424cdd87efeb0726e11..51781cd3acdfd77aa5033bc439a25c5df7158b62 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,13 +77,13 @@ find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS
     Codecs
 )
 
     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"
         )
 
         PROPERTIES TYPE OPTIONAL
         PURPOSE "Used for submission of telemetry data"
         )
 

-if(KUserFeedbackQt6_FOUND)
+if(KF6UserFeedback_FOUND)

     set(HAVE_KUSERFEEDBACK TRUE)
 endif()
 
     set(HAVE_KUSERFEEDBACK TRUE)
 endif()
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5d04cbabe08e6dd33d625fb6da316752a559f79d..be83cd2d0a56b420d556b0f6cabea52d144040bb 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -447,8 +447,8 @@ endif()
 if (HAVE_KUSERFEEDBACK)
     target_link_libraries(
         dolphinstatic
 if (HAVE_KUSERFEEDBACK)
     target_link_libraries(
         dolphinstatic

-        KUserFeedbackCoreQt6
-        KUserFeedbackWidgetsQt6
+        KF6::UserFeedbackCore
+        KF6::UserFeedbackWidgets

     )
 endif()
 
     )
 endif()
 

diff --git a/src/settings/userfeedback/userfeedbacksettingspage.cpp b/src/settings/userfeedback/userfeedbacksettingspage.cpp
index 7d87cb2fc6f2f176f19d94286e61839a664d9fdc..6c205acee8131d5b417790970c9125d05ac8f46d 100644 (file)
--- a/src/settings/userfeedback/userfeedbacksettingspage.cpp
+++ b/src/settings/userfeedback/userfeedbacksettingspage.cpp
@@ -7,8 +7,8 @@
 #include "userfeedbacksettingspage.h"
 #include "userfeedback/dolphinfeedbackprovider.h"
 
 #include "userfeedbacksettingspage.h"
 #include "userfeedback/dolphinfeedbackprovider.h"
 

-#include <KUserFeedbackQt6/FeedbackConfigWidget>
-#include <KUserFeedbackQt6/Provider>
+#include <KUserFeedback/FeedbackConfigWidget>
+#include <KUserFeedback/Provider>

 
 #include <QVBoxLayout>
 
 
 #include <QVBoxLayout>
 

diff --git a/src/userfeedback/dolphinfeedbackprovider.cpp b/src/userfeedback/dolphinfeedbackprovider.cpp
index f233fad462a37f491ea3312c6363269198320ca2..19526dc4d2429aa5ae959ed7b6046b72186e5960 100644 (file)
--- a/src/userfeedback/dolphinfeedbackprovider.cpp
+++ b/src/userfeedback/dolphinfeedbackprovider.cpp
@@ -8,13 +8,13 @@
 #include "placesdatasource.h"
 #include "settingsdatasource.h"
 
 #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()
 {
 
 DolphinFeedbackProvider *DolphinFeedbackProvider::instance()
 {

diff --git a/src/userfeedback/dolphinfeedbackprovider.h b/src/userfeedback/dolphinfeedbackprovider.h
index 3b85c7eb35c660cbc58f3db3bde86f1971c16417..8be2f81b6fa1c4d2f1643617057401ad2871c699 100644 (file)
--- a/src/userfeedback/dolphinfeedbackprovider.h
+++ b/src/userfeedback/dolphinfeedbackprovider.h
@@ -7,7 +7,7 @@
 #ifndef DOLPHINFEEDBACKPROVIDER_H
 #define DOLPHINFEEDBACKPROVIDER_H
 
 #ifndef DOLPHINFEEDBACKPROVIDER_H
 #define DOLPHINFEEDBACKPROVIDER_H
 

-#include <KUserFeedbackQt6/Provider>
+#include <KUserFeedback/Provider>

 
 class DolphinFeedbackProvider : public KUserFeedback::Provider
 {
 
 class DolphinFeedbackProvider : public KUserFeedback::Provider
 {

diff --git a/src/userfeedback/placesdatasource.cpp b/src/userfeedback/placesdatasource.cpp
index 554194af75578996578da8d7f6fe817d450c87d9..cdbd5d7570aef0e52d9525f04e2b063e809e6f55 100644 (file)
--- a/src/userfeedback/placesdatasource.cpp
+++ b/src/userfeedback/placesdatasource.cpp
@@ -8,7 +8,7 @@
 
 #include <KLocalizedString>
 #include <KMountPoint>
 
 #include <KLocalizedString>
 #include <KMountPoint>

-#include <KUserFeedbackQt6/Provider>
+#include <KUserFeedback/Provider>

 #include <Solid/Device>
 #include <Solid/NetworkShare>
 #include <Solid/StorageAccess>
 #include <Solid/Device>
 #include <Solid/NetworkShare>
 #include <Solid/StorageAccess>

diff --git a/src/userfeedback/placesdatasource.h b/src/userfeedback/placesdatasource.h
index ad4c1725d6d32c3716c1d1d0fb7ff4d3773e6801..d4666af25f102d04e3e2ce620591a46439856d49 100644 (file)
--- a/src/userfeedback/placesdatasource.h
+++ b/src/userfeedback/placesdatasource.h
@@ -7,7 +7,7 @@
 #ifndef PLACESDATASOURCE_H
 #define PLACESDATASOURCE_H
 
 #ifndef PLACESDATASOURCE_H
 #define PLACESDATASOURCE_H
 

-#include <KUserFeedbackQt6/AbstractDataSource>
+#include <KUserFeedback/AbstractDataSource>

 
 class DolphinMainWindow;
 
 
 class DolphinMainWindow;
 

diff --git a/src/userfeedback/settingsdatasource.cpp b/src/userfeedback/settingsdatasource.cpp
index d14fc0dbd94e1a79ec06f7f8889940caf8764eb4..c517793adbd083d41af0674cc1c71cb7ea5bd385 100644 (file)
--- a/src/userfeedback/settingsdatasource.cpp
+++ b/src/userfeedback/settingsdatasource.cpp
@@ -9,7 +9,7 @@
 #include "dolphinmainwindow.h"
 
 #include <KLocalizedString>
 #include "dolphinmainwindow.h"
 
 #include <KLocalizedString>

-#include <KUserFeedbackQt6/Provider>
+#include <KUserFeedback/Provider>

 
 #include <QApplication>
 #include <QVariant>
 
 #include <QApplication>
 #include <QVariant>

diff --git a/src/userfeedback/settingsdatasource.h b/src/userfeedback/settingsdatasource.h
index cc843dec81c5a361010bfbf076d64d5e90ceef86..9804c78a790ea8e26a36eaa4a5d9e4d05c498736 100644 (file)
--- a/src/userfeedback/settingsdatasource.h
+++ b/src/userfeedback/settingsdatasource.h
@@ -7,7 +7,7 @@
 #ifndef SETTINGSDATASOURCE_H
 #define SETTINGSDATASOURCE_H
 
 #ifndef SETTINGSDATASOURCE_H
 #define SETTINGSDATASOURCE_H
 

-#include <KUserFeedbackQt6/AbstractDataSource>
+#include <KUserFeedback/AbstractDataSource>

 
 class DolphinMainWindow;
 
 
 class DolphinMainWindow;