diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,8 +17,8 @@ include(KDECompilerSettings NO_POLICY_SCOPE) include(KDEClangFormat) -find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets DBus X11Extras) -find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Activities Auth IdleTime Config DBusAddons Solid I18n GlobalAccel KIO NotifyConfig Wayland DocTools Crash Notifications) +find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets DBus Network X11Extras) +find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Activities Auth IdleTime Config DBusAddons Service Solid I18n GlobalAccel NotifyConfig Wayland DocTools Crash Notifications WidgetsAddons XmlGui) find_package(KF5Screen CONFIG REQUIRED) find_package(LibKWorkspace CONFIG REQUIRED) diff --git a/daemon/actions/bundled/CMakeLists.txt b/daemon/actions/bundled/CMakeLists.txt --- a/daemon/actions/bundled/CMakeLists.txt +++ b/daemon/actions/bundled/CMakeLists.txt @@ -18,8 +18,6 @@ add_powerdevil_bundled_action(brightnesscontrol KF5::GlobalAccel) add_powerdevil_bundled_action(keyboardbrightnesscontrol) add_powerdevil_bundled_action(dimdisplay) -add_powerdevil_bundled_action(runscript KF5::KIOCore KF5::KIOWidgets) -add_powerdevil_bundled_action(suspendsession KF5::KIOCore KF5::KIOWidgets) if(HAVE_WIRELESS_SUPPORT) add_powerdevil_bundled_action(wirelesspowersaving KF5::NetworkManagerQt KF5::BluezQt) endif() diff --git a/daemon/actions/bundled/runscriptconfig.h b/daemon/actions/bundled/runscriptconfig.h --- a/daemon/actions/bundled/runscriptconfig.h +++ b/daemon/actions/bundled/runscriptconfig.h @@ -23,8 +23,8 @@ #include +class QComboBox; class QSpinBox; -class KComboBox; class KUrlRequester; namespace PowerDevil { @@ -45,7 +45,7 @@ private: KUrlRequester *m_urlRequester; - KComboBox *m_comboBox; + QComboBox *m_comboBox; QSpinBox *m_idleTime; private Q_SLOTS: diff --git a/daemon/actions/bundled/runscriptconfig.cpp b/daemon/actions/bundled/runscriptconfig.cpp --- a/daemon/actions/bundled/runscriptconfig.cpp +++ b/daemon/actions/bundled/runscriptconfig.cpp @@ -20,13 +20,13 @@ #include "runscriptconfig.h" +#include #include #include #include #include #include -#include #include #include @@ -72,7 +72,7 @@ QWidget *tempWidget = new QWidget; QHBoxLayout *hlay = new QHBoxLayout; - m_comboBox = new KComboBox; + m_comboBox = new QComboBox; m_idleTime = new QSpinBox; m_idleTime->setMaximumWidth(150); m_idleTime->setMinimum(1); diff --git a/daemon/actions/bundled/suspendsessionconfig.h b/daemon/actions/bundled/suspendsessionconfig.h --- a/daemon/actions/bundled/suspendsessionconfig.h +++ b/daemon/actions/bundled/suspendsessionconfig.h @@ -23,8 +23,8 @@ #include -class KComboBox; class QCheckBox; +class QComboBox; class QSpinBox; namespace PowerDevil { @@ -45,7 +45,7 @@ private: QSpinBox *m_idleTime; QCheckBox *m_suspendThenHibernateEnabled; - KComboBox *m_comboBox; + QComboBox *m_comboBox; }; } diff --git a/daemon/actions/bundled/suspendsessionconfig.cpp b/daemon/actions/bundled/suspendsessionconfig.cpp --- a/daemon/actions/bundled/suspendsessionconfig.cpp +++ b/daemon/actions/bundled/suspendsessionconfig.cpp @@ -22,10 +22,10 @@ #include "powerdevilpowermanagement.h" +#include #include #include -#include #include #include #include @@ -77,7 +77,7 @@ { QWidget *tempWidget = new QWidget; QHBoxLayout *hlay = new QHBoxLayout; - m_comboBox = new KComboBox; + m_comboBox = new QComboBox; m_idleTime = new QSpinBox; m_idleTime->setMaximumWidth(150); m_idleTime->setMinimum(1); diff --git a/kcmodule/global/CMakeLists.txt b/kcmodule/global/CMakeLists.txt --- a/kcmodule/global/CMakeLists.txt +++ b/kcmodule/global/CMakeLists.txt @@ -13,7 +13,6 @@ target_link_libraries(kcm_powerdevilglobalconfig KF5::ConfigWidgets - KF5::KIOWidgets KF5::NotifyConfig powerdevilconfigcommonprivate ) diff --git a/kcmodule/global/generalPage.ui b/kcmodule/global/generalPage.ui --- a/kcmodule/global/generalPage.ui +++ b/kcmodule/global/generalPage.ui @@ -104,7 +104,7 @@ - + 300 @@ -196,13 +196,6 @@ - - - KComboBox - QComboBox -
kcombobox.h
-
-
diff --git a/kcmodule/profiles/CMakeLists.txt b/kcmodule/profiles/CMakeLists.txt --- a/kcmodule/profiles/CMakeLists.txt +++ b/kcmodule/profiles/CMakeLists.txt @@ -14,7 +14,6 @@ add_library(kcm_powerdevilprofilesconfig MODULE ${kcm_powerdevil_profiles_SRCS}) target_link_libraries(kcm_powerdevilprofilesconfig - KF5::KIOWidgets KF5::ConfigGui KF5::ConfigWidgets powerdevilui diff --git a/kcmodule/profiles/EditPage.h b/kcmodule/profiles/EditPage.h --- a/kcmodule/profiles/EditPage.h +++ b/kcmodule/profiles/EditPage.h @@ -50,8 +50,6 @@ void notifyDaemon(); - void openUrl(const QString &url); - void onServiceRegistered(const QString &service); void onServiceUnregistered(const QString &service); diff --git a/kcmodule/profiles/EditPage.cpp b/kcmodule/profiles/EditPage.cpp --- a/kcmodule/profiles/EditPage.cpp +++ b/kcmodule/profiles/EditPage.cpp @@ -47,7 +47,6 @@ #include #include #include -#include #include #include @@ -206,11 +205,6 @@ } } -void EditPage::openUrl(const QString &url) -{ - new KRun(QUrl(url), this); -} - void EditPage::defaults() { restoreDefaultProfiles();