From 93237493e4ef0efa7d5840ffceec044e6946662c Mon Sep 17 00:00:00 2001 From: Jonathan Esk-Riddell Date: Fri, 10 Nov 2023 17:55:23 +0000 Subject: Port to KF6 rename of KUserFeedback --- src/CMakeLists.txt | 4 ++-- src/settings/userfeedback/userfeedbacksettingspage.cpp | 4 ++-- src/userfeedback/dolphinfeedbackprovider.cpp | 14 +++++++------- src/userfeedback/dolphinfeedbackprovider.h | 2 +- src/userfeedback/placesdatasource.cpp | 2 +- src/userfeedback/placesdatasource.h | 2 +- src/userfeedback/settingsdatasource.cpp | 2 +- src/userfeedback/settingsdatasource.h | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src') 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 -#include +#include +#include #include 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 -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include 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 +#include 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 #include -#include +#include #include #include #include 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 +#include 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 -#include +#include #include #include 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 +#include class DolphinMainWindow; -- cgit v1.3