marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kcms: port to new KCMUtils KCM classes

Browse source
This commit is contained in:
Yari Polla 2023-03-18 18:53:52 +01:00
parent 3f309067ef
commit be7c36d0c2
24 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcms/cellularnetwork/CMakeLists.txt
View file

@ -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)

2
kcms/cellularnetwork/cellularnetworksettings.cpp
View file

@ -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{}
{

4
kcms/cellularnetwork/cellularnetworksettings.h
View file

@ -9,7 +9,7 @@
#include <QSharedPointer>
#include <KQuickAddons/ConfigModule>
#include <KQuickConfigModule>
#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)

2
kcms/hotspot/CMakeLists.txt
View file

@ -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)

2
kcms/hotspot/hotspotsettings.cpp
View file

@ -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)
{
}

4
kcms/hotspot/hotspotsettings.h
View file

@ -7,9 +7,9 @@
#ifndef HOTSPOTSETTINGS_H
#define HOTSPOTSETTINGS_H
#include <KQuickAddons/ConfigModule>
#include <KQuickConfigModule>
class HotspotSettings : public KQuickAddons::ConfigModule
class HotspotSettings : public KQuickConfigModule
{
Q_OBJECT
public:

2
kcms/info/CMakeLists.txt
View file

@ -14,7 +14,7 @@ target_link_libraries(kcm_mobile_info
Qt::Core
KF6::CoreAddons
KF6::I18n
KF6::QuickAddons
KF6::KCMUtilsQuick
KF6::ConfigCore
KF6::Solid
)

2
kcms/info/info.cpp
View file

@ -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))

4
kcms/info/info.h
View file

@ -7,12 +7,12 @@
#include "distroinfo.h"
#include "hardwareinfo.h"
#include "softwareinfo.h"
#include <KQuickAddons/ConfigModule>
#include <KQuickConfigModule>
#ifndef INFO_H
#define INFO_H
class Info : public KQuickAddons::ConfigModule
class Info : public KQuickConfigModule
{
Q_OBJECT

2
kcms/mobileshell/CMakeLists.txt
View file

@ -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)

2
kcms/mobileshell/kcm.cpp
View file

@ -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({});
}

4
kcms/mobileshell/kcm.h
View file

@ -6,10 +6,10 @@
#pragma once
#include <KConfigGroup>
#include <KQuickAddons/ManagedConfigModule>
#include <KQuickManagedConfigModule>
#include <KSharedConfig>
class KCMMobileShell : public KQuickAddons::ManagedConfigModule
class KCMMobileShell : public KQuickManagedConfigModule
{
Q_OBJECT

2
kcms/powermanagement/CMakeLists.txt
View file

@ -16,7 +16,7 @@ target_link_libraries(kcm_mobile_power
Qt::Core
KF6::CoreAddons
KF6::I18n
KF6::QuickAddons
KF6::KCMUtilsQuick
KF6::ConfigCore
KF6::Solid
)

4
kcms/powermanagement/mobilepower.cpp
View file

@ -46,7 +46,7 @@ const QMap<int, qreal> 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<Solid::Battery>("org.kde.kcm.power.mobile.private", 1, 0, "Battery", "");
qmlRegisterType<StatisticsProvider>("org.kde.kcm.power.mobile.private", 1, 0, "HistoryModel");
setButtons(KQuickAddons::ConfigModule::NoAdditionalButton);
setButtons(KQuickConfigModule::NoAdditionalButton);
load();
}

4
kcms/powermanagement/mobilepower.h
View file

@ -5,11 +5,11 @@
#include "batterymodel.h"
#include <KQuickAddons/ConfigModule>
#include <KQuickConfigModule>
#include <KSharedConfig>
#include <memory>
class MobilePower : public KQuickAddons::ConfigModule
class MobilePower : public KQuickConfigModule
{
Q_OBJECT
Q_PROPERTY(BatteryModel *batteries READ batteries CONSTANT)

2
kcms/time/CMakeLists.txt
View file

@ -16,7 +16,7 @@ target_link_libraries(kcm_mobile_time
Qt::Quick
Qt::Qml
Qt::DBus
KF6::QuickAddons
KF6::KCMUtilsQuick
KF6::ConfigCore
KF6::I18n
)

2
kcms/time/timesettings.cpp
View file

@ -34,7 +34,7 @@
K_PLUGIN_FACTORY_WITH_JSON(TimeSettingsFactory, "kcm_mobile_time.json", registerPlugin<TimeSettings>();)
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";

4
kcms/time/timesettings.h
View file

@ -18,7 +18,7 @@
#include <KConfigGroup>
#include <KSharedConfig>
#include <KQuickAddons/ConfigModule>
#include <KQuickConfigModule>
#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

2
kcms/virtualkeyboard/CMakeLists.txt
View file

@ -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

2
kcms/virtualkeyboard/virtualkeyboard.cpp
View file

@ -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))
{

4
kcms/virtualkeyboard/virtualkeyboard.h
View file

@ -5,7 +5,7 @@
*/
#include "languagemodel.h"
#include <KQuickAddons/ConfigModule>
#include <KQuickConfigModule>
#include <QList>
#include <QString>
@ -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)

2
kcms/wifi/CMakeLists.txt
View file

@ -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)

2
kcms/wifi/wifisettings.cpp
View file

@ -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)
{
}

4
kcms/wifi/wifisettings.h
View file

@ -7,9 +7,9 @@
#ifndef WIFISETTINGS_H
#define WIFISETTINGS_H
#include <KQuickAddons/ConfigModule>
#include <KQuickConfigModule>
class WifiSettings : public KQuickAddons::ConfigModule
class WifiSettings : public KQuickConfigModule
{
Q_OBJECT
public: