From ce3761343340236e4031780fe0a219b9ba57b77d Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 20 Jun 2023 04:48:50 +0300 Subject: [PATCH] kfirewall: build fix Signed-off-by: Ivailo Monev --- kfirewall/CMakeLists.txt | 4 ++-- kfirewall/kcm/CMakeLists.txt | 6 +++--- kfirewall/kcm/kfirewallhelper.cpp | 6 ++++++ kfirewall/kcm/kfirewallhelper.h | 2 ++ kfirewall/kded/CMakeLists.txt | 2 +- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/kfirewall/CMakeLists.txt b/kfirewall/CMakeLists.txt index 2f1d34a5..e7c77d76 100644 --- a/kfirewall/CMakeLists.txt +++ b/kfirewall/CMakeLists.txt @@ -3,8 +3,8 @@ project(kfirewall) if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) include(FeatureSummary) - find_package(KDE4 4.21.0 REQUIRED) - include(KDE4Defaults) + find_package(KDELibs4 4.21.0 REQUIRED) + include_directories(${KDE4_INCLUDES}) add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) endif() diff --git a/kfirewall/kcm/CMakeLists.txt b/kfirewall/kcm/CMakeLists.txt index 11cf7558..2a13267b 100644 --- a/kfirewall/kcm/CMakeLists.txt +++ b/kfirewall/kcm/CMakeLists.txt @@ -8,8 +8,8 @@ set(kfirewallconfig_SRCS kde4_add_plugin(kcm_kfirewallconfig ${kfirewallconfig_SRCS}) target_link_libraries(kcm_kfirewallconfig - ${KDE4_KDEUI_LIBS} - ${KDE4_KCMUTILS_LIBS} + KDE4::kdeui + KDE4::kcmutils ) install( @@ -26,7 +26,7 @@ install( add_executable(kcmkfirewallhelper kfirewallhelper.cpp) target_link_libraries(kcmkfirewallhelper - ${KDE4_KDECORE_LIBS} + KDE4::kdecore ) install( diff --git a/kfirewall/kcm/kfirewallhelper.cpp b/kfirewall/kcm/kfirewallhelper.cpp index 73ca38a5..e0649fc7 100644 --- a/kfirewall/kcm/kfirewallhelper.cpp +++ b/kfirewall/kcm/kfirewallhelper.cpp @@ -128,6 +128,12 @@ static int applyRules(KFirewallHelper *helper, const QString &iptablesexe, return KAuthorization::NoError; } +KFirewallHelper::KFirewallHelper(const char* const helper, QObject *parent) + : KAuthorization(helper, parent) +{ +} + + int KFirewallHelper::apply(const QVariantMap ¶meters) { if (parameters.isEmpty()) { diff --git a/kfirewall/kcm/kfirewallhelper.h b/kfirewall/kcm/kfirewallhelper.h index 468298e5..4f8fc36c 100644 --- a/kfirewall/kcm/kfirewallhelper.h +++ b/kfirewall/kcm/kfirewallhelper.h @@ -24,6 +24,8 @@ class KFirewallHelper : public KAuthorization { Q_OBJECT +public: + KFirewallHelper(const char* const helper, QObject *parent); public slots: int apply(const QVariantMap ¶meters); int revert(const QVariantMap ¶meters); diff --git a/kfirewall/kded/CMakeLists.txt b/kfirewall/kded/CMakeLists.txt index 81516548..0ed80961 100644 --- a/kfirewall/kded/CMakeLists.txt +++ b/kfirewall/kded/CMakeLists.txt @@ -9,7 +9,7 @@ qt4_generate_dbus_interface(kded_kfirewall.h org.kde.kfirewall.xml ) kde4_add_plugin(kded_kfirewall ${kded_kfirewall_SRCS}) target_link_libraries(kded_kfirewall PRIVATE - ${KDE4_KDECORE_LIBS} + KDE4::kdecore ) install(