diff --git a/kcms/cellularnetwork/CMakeLists.txt b/kcms/cellularnetwork/CMakeLists.txt index ce5d03fe..5bdf3aaa 100644 --- a/kcms/cellularnetwork/CMakeLists.txt +++ b/kcms/cellularnetwork/CMakeLists.txt @@ -22,7 +22,7 @@ target_link_libraries(kcm_cellular_network KF6::I18n KF6::NetworkManagerQt KF6::ModemManagerQt - KF6::QuickAddons + KF6::KCMUtilsQuick ) kcmutils_generate_desktop_file(kcm_cellular_network) diff --git a/kcms/cellularnetwork/cellularnetworksettings.cpp b/kcms/cellularnetwork/cellularnetworksettings.cpp index 0fa50c7a..61ddbfdc 100644 --- a/kcms/cellularnetwork/cellularnetworksettings.cpp +++ b/kcms/cellularnetwork/cellularnetworksettings.cpp @@ -18,7 +18,7 @@ K_PLUGIN_CLASS_WITH_JSON(CellularNetworkSettings, "kcm_cellular_network.json") CellularNetworkSettings *CellularNetworkSettings::staticInst = nullptr; CellularNetworkSettings::CellularNetworkSettings(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args) - : KQuickAddons::ConfigModule(parent, metaData, args) + : KQuickConfigModule(parent, metaData, args) , m_modemList{} , m_simList{} { diff --git a/kcms/cellularnetwork/cellularnetworksettings.h b/kcms/cellularnetwork/cellularnetworksettings.h index f7675b0e..cca6012b 100644 --- a/kcms/cellularnetwork/cellularnetworksettings.h +++ b/kcms/cellularnetwork/cellularnetworksettings.h @@ -9,7 +9,7 @@ #include -#include +#include #include "mobileproviders.h" #include "modem.h" @@ -59,7 +59,7 @@ private: QString m_message; }; -class CellularNetworkSettings : public KQuickAddons::ConfigModule +class CellularNetworkSettings : public KQuickConfigModule { Q_OBJECT Q_PROPERTY(bool modemFound READ modemFound NOTIFY modemFoundChanged) diff --git a/kcms/hotspot/CMakeLists.txt b/kcms/hotspot/CMakeLists.txt index 54f562bb..0bf6d2f2 100644 --- a/kcms/hotspot/CMakeLists.txt +++ b/kcms/hotspot/CMakeLists.txt @@ -10,7 +10,7 @@ target_link_libraries(kcm_mobile_hotspot Qt::Qml KF6::I18n KF6::CoreAddons - KF6::QuickAddons + KF6::KCMUtilsQuick ) kpackage_install_package(package kcm_mobile_hotspot kcms) diff --git a/kcms/hotspot/hotspotsettings.cpp b/kcms/hotspot/hotspotsettings.cpp index 47d77b3a..65279d17 100644 --- a/kcms/hotspot/hotspotsettings.cpp +++ b/kcms/hotspot/hotspotsettings.cpp @@ -12,7 +12,7 @@ K_PLUGIN_CLASS_WITH_JSON(HotspotSettings, "kcm_mobile_hotspot.json") HotspotSettings::HotspotSettings(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args) - : KQuickAddons::ConfigModule(parent, metaData, args) + : KQuickConfigModule(parent, metaData, args) { } diff --git a/kcms/hotspot/hotspotsettings.h b/kcms/hotspot/hotspotsettings.h index 48eb20d5..9e7c8d69 100644 --- a/kcms/hotspot/hotspotsettings.h +++ b/kcms/hotspot/hotspotsettings.h @@ -7,9 +7,9 @@ #ifndef HOTSPOTSETTINGS_H #define HOTSPOTSETTINGS_H -#include +#include -class HotspotSettings : public KQuickAddons::ConfigModule +class HotspotSettings : public KQuickConfigModule { Q_OBJECT public: diff --git a/kcms/info/CMakeLists.txt b/kcms/info/CMakeLists.txt index 563fb1ee..fb8bb111 100644 --- a/kcms/info/CMakeLists.txt +++ b/kcms/info/CMakeLists.txt @@ -14,7 +14,7 @@ target_link_libraries(kcm_mobile_info Qt::Core KF6::CoreAddons KF6::I18n - KF6::QuickAddons + KF6::KCMUtilsQuick KF6::ConfigCore KF6::Solid ) diff --git a/kcms/info/info.cpp b/kcms/info/info.cpp index ede5ac0a..184e7d76 100644 --- a/kcms/info/info.cpp +++ b/kcms/info/info.cpp @@ -14,7 +14,7 @@ K_PLUGIN_CLASS_WITH_JSON(Info, "kcm_mobile_info.json") Info::Info(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args) - : KQuickAddons::ConfigModule(parent, metaData, args) + : KQuickConfigModule(parent, metaData, args) , m_distroInfo(new DistroInfo(this)) , m_softwareInfo(new SoftwareInfo(this)) , m_hardwareInfo(new HardwareInfo(this)) diff --git a/kcms/info/info.h b/kcms/info/info.h index 51a8be75..f56770a6 100644 --- a/kcms/info/info.h +++ b/kcms/info/info.h @@ -7,12 +7,12 @@ #include "distroinfo.h" #include "hardwareinfo.h" #include "softwareinfo.h" -#include +#include #ifndef INFO_H #define INFO_H -class Info : public KQuickAddons::ConfigModule +class Info : public KQuickConfigModule { Q_OBJECT diff --git a/kcms/mobileshell/CMakeLists.txt b/kcms/mobileshell/CMakeLists.txt index bc5c3fc8..b9c37d31 100644 --- a/kcms/mobileshell/CMakeLists.txt +++ b/kcms/mobileshell/CMakeLists.txt @@ -8,7 +8,7 @@ target_link_libraries(kcm_mobileshell KF6::CoreAddons KF6::KCMUtils KF6::I18n - KF6::QuickAddons + KF6::KCMUtilsQuick ) kcmutils_generate_desktop_file(kcm_mobileshell) diff --git a/kcms/mobileshell/kcm.cpp b/kcms/mobileshell/kcm.cpp index 49a1cd82..2a071bfe 100644 --- a/kcms/mobileshell/kcm.cpp +++ b/kcms/mobileshell/kcm.cpp @@ -10,7 +10,7 @@ K_PLUGIN_CLASS_WITH_JSON(KCMMobileShell, "kcm_mobileshell.json") KCMMobileShell::KCMMobileShell(QObject *parent, const KPluginMetaData &data, const QVariantList &args) - : KQuickAddons::ManagedConfigModule(parent, data, args) + : KQuickManagedConfigModule(parent, data, args) { setButtons({}); } diff --git a/kcms/mobileshell/kcm.h b/kcms/mobileshell/kcm.h index 7845a078..538a87a6 100644 --- a/kcms/mobileshell/kcm.h +++ b/kcms/mobileshell/kcm.h @@ -6,10 +6,10 @@ #pragma once #include -#include +#include #include -class KCMMobileShell : public KQuickAddons::ManagedConfigModule +class KCMMobileShell : public KQuickManagedConfigModule { Q_OBJECT diff --git a/kcms/powermanagement/CMakeLists.txt b/kcms/powermanagement/CMakeLists.txt index c7da852c..17226f50 100644 --- a/kcms/powermanagement/CMakeLists.txt +++ b/kcms/powermanagement/CMakeLists.txt @@ -16,7 +16,7 @@ target_link_libraries(kcm_mobile_power Qt::Core KF6::CoreAddons KF6::I18n - KF6::QuickAddons + KF6::KCMUtilsQuick KF6::ConfigCore KF6::Solid ) diff --git a/kcms/powermanagement/mobilepower.cpp b/kcms/powermanagement/mobilepower.cpp index f0e4ecb0..0b7e8741 100644 --- a/kcms/powermanagement/mobilepower.cpp +++ b/kcms/powermanagement/mobilepower.cpp @@ -46,7 +46,7 @@ const QMap idxToMinutes = { }; MobilePower::MobilePower(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args) - : KQuickAddons::ConfigModule(parent, metaData, args) + : KQuickConfigModule(parent, metaData, args) , m_batteries{new BatteryModel(this)} , m_profilesConfig{KSharedConfig::openConfig("powermanagementprofilesrc", KConfig::SimpleConfig | KConfig::CascadeConfig)} { @@ -54,7 +54,7 @@ MobilePower::MobilePower(QObject *parent, const KPluginMetaData &metaData, const qmlRegisterUncreatableType("org.kde.kcm.power.mobile.private", 1, 0, "Battery", ""); qmlRegisterType("org.kde.kcm.power.mobile.private", 1, 0, "HistoryModel"); - setButtons(KQuickAddons::ConfigModule::NoAdditionalButton); + setButtons(KQuickConfigModule::NoAdditionalButton); load(); } diff --git a/kcms/powermanagement/mobilepower.h b/kcms/powermanagement/mobilepower.h index b7555fdf..580059ed 100644 --- a/kcms/powermanagement/mobilepower.h +++ b/kcms/powermanagement/mobilepower.h @@ -5,11 +5,11 @@ #include "batterymodel.h" -#include +#include #include #include -class MobilePower : public KQuickAddons::ConfigModule +class MobilePower : public KQuickConfigModule { Q_OBJECT Q_PROPERTY(BatteryModel *batteries READ batteries CONSTANT) diff --git a/kcms/time/CMakeLists.txt b/kcms/time/CMakeLists.txt index 94be89b8..fb97342b 100644 --- a/kcms/time/CMakeLists.txt +++ b/kcms/time/CMakeLists.txt @@ -16,7 +16,7 @@ target_link_libraries(kcm_mobile_time Qt::Quick Qt::Qml Qt::DBus - KF6::QuickAddons + KF6::KCMUtilsQuick KF6::ConfigCore KF6::I18n ) diff --git a/kcms/time/timesettings.cpp b/kcms/time/timesettings.cpp index 1e64d878..975deede 100644 --- a/kcms/time/timesettings.cpp +++ b/kcms/time/timesettings.cpp @@ -34,7 +34,7 @@ K_PLUGIN_FACTORY_WITH_JSON(TimeSettingsFactory, "kcm_mobile_time.json", registerPlugin();) TimeSettings::TimeSettings(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args) - : KQuickAddons::ConfigModule(parent, metaData, args) + : KQuickConfigModule(parent, metaData, args) , m_useNtp(true) { qDebug() << "time settings init"; diff --git a/kcms/time/timesettings.h b/kcms/time/timesettings.h index 254bf19f..7137d60e 100644 --- a/kcms/time/timesettings.h +++ b/kcms/time/timesettings.h @@ -18,7 +18,7 @@ #include #include -#include +#include #include "timezonemodel.h" @@ -33,7 +33,7 @@ class TimeSettingsPrivate; * This is done from one class in order to simplify the code. You can export any QObject-based * class through qmlRegisterType(), however. */ -class TimeSettings : public KQuickAddons::ConfigModule +class TimeSettings : public KQuickConfigModule { Q_OBJECT diff --git a/kcms/virtualkeyboard/CMakeLists.txt b/kcms/virtualkeyboard/CMakeLists.txt index 781895ce..a5057020 100644 --- a/kcms/virtualkeyboard/CMakeLists.txt +++ b/kcms/virtualkeyboard/CMakeLists.txt @@ -19,7 +19,7 @@ target_link_libraries(kcm_mobile_onscreenkeyboard Qt::Core KF6::CoreAddons KF6::I18n - KF6::QuickAddons + KF6::KCMUtilsQuick KF6::ConfigCore PkgConfig::GIO PkgConfig::GOBJECT diff --git a/kcms/virtualkeyboard/virtualkeyboard.cpp b/kcms/virtualkeyboard/virtualkeyboard.cpp index 689ca87f..48b51a01 100644 --- a/kcms/virtualkeyboard/virtualkeyboard.cpp +++ b/kcms/virtualkeyboard/virtualkeyboard.cpp @@ -29,7 +29,7 @@ K_PLUGIN_CLASS_WITH_JSON(VirtualKeyboard, "kcm_mobile_onscreenkeyboard.json") VirtualKeyboard::VirtualKeyboard(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args) - : KQuickAddons::ConfigModule(parent, metaData, args) + : KQuickConfigModule(parent, metaData, args) , m_gsettings(new GSettingsItem("/org/maliit/keyboard/maliit/", parent)) , m_langModel(new LanguageModel(this, m_gsettings)) { diff --git a/kcms/virtualkeyboard/virtualkeyboard.h b/kcms/virtualkeyboard/virtualkeyboard.h index 091a5736..2a7f1105 100644 --- a/kcms/virtualkeyboard/virtualkeyboard.h +++ b/kcms/virtualkeyboard/virtualkeyboard.h @@ -5,7 +5,7 @@ */ #include "languagemodel.h" -#include +#include #include #include @@ -13,7 +13,7 @@ #ifndef VIRTUALKEYBOARD_H #define VIRTUALKEYBOARD_H -class VirtualKeyboard : public KQuickAddons::ConfigModule +class VirtualKeyboard : public KQuickConfigModule { Q_OBJECT Q_PROPERTY(LanguageModel *languageModel MEMBER m_langModel CONSTANT) diff --git a/kcms/wifi/CMakeLists.txt b/kcms/wifi/CMakeLists.txt index 4194c2ba..a7dfaf75 100644 --- a/kcms/wifi/CMakeLists.txt +++ b/kcms/wifi/CMakeLists.txt @@ -15,7 +15,7 @@ target_link_libraries(kcm_mobile_wifi KF6::I18n KF6::NetworkManagerQt KF6::Plasma - KF6::QuickAddons + KF6::KCMUtilsQuick ) kpackage_install_package(package kcm_mobile_wifi kcms) diff --git a/kcms/wifi/wifisettings.cpp b/kcms/wifi/wifisettings.cpp index d73d0179..90359dd3 100644 --- a/kcms/wifi/wifisettings.cpp +++ b/kcms/wifi/wifisettings.cpp @@ -26,7 +26,7 @@ K_PLUGIN_CLASS_WITH_JSON(WifiSettings, "kcm_mobile_wifi.json") WifiSettings::WifiSettings(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args) - : KQuickAddons::ConfigModule(parent, metaData, args) + : KQuickConfigModule(parent, metaData, args) { } diff --git a/kcms/wifi/wifisettings.h b/kcms/wifi/wifisettings.h index b469ef59..c927b735 100644 --- a/kcms/wifi/wifisettings.h +++ b/kcms/wifi/wifisettings.h @@ -7,9 +7,9 @@ #ifndef WIFISETTINGS_H #define WIFISETTINGS_H -#include +#include -class WifiSettings : public KQuickAddons::ConfigModule +class WifiSettings : public KQuickConfigModule { Q_OBJECT public: