diff --git a/kcms/cellularnetwork/cellularnetworksettings.cpp b/kcms/cellularnetwork/cellularnetworksettings.cpp index 61ddbfdc..6cd755fd 100644 --- a/kcms/cellularnetwork/cellularnetworksettings.cpp +++ b/kcms/cellularnetwork/cellularnetworksettings.cpp @@ -17,8 +17,8 @@ K_PLUGIN_CLASS_WITH_JSON(CellularNetworkSettings, "kcm_cellular_network.json") CellularNetworkSettings *CellularNetworkSettings::staticInst = nullptr; -CellularNetworkSettings::CellularNetworkSettings(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args) - : KQuickConfigModule(parent, metaData, args) +CellularNetworkSettings::CellularNetworkSettings(QObject *parent, const KPluginMetaData &metaData) + : KQuickConfigModule(parent, metaData) , m_modemList{} , m_simList{} { diff --git a/kcms/cellularnetwork/cellularnetworksettings.h b/kcms/cellularnetwork/cellularnetworksettings.h index cca6012b..6910a20b 100644 --- a/kcms/cellularnetwork/cellularnetworksettings.h +++ b/kcms/cellularnetwork/cellularnetworksettings.h @@ -68,7 +68,7 @@ class CellularNetworkSettings : public KQuickConfigModule Q_PROPERTY(QList messages READ messages NOTIFY messagesChanged) public: - CellularNetworkSettings(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args); + CellularNetworkSettings(QObject *parent, const KPluginMetaData &metaData); static CellularNetworkSettings *instance(); diff --git a/kcms/hotspot/hotspotsettings.cpp b/kcms/hotspot/hotspotsettings.cpp index 65279d17..0ac7b9a4 100644 --- a/kcms/hotspot/hotspotsettings.cpp +++ b/kcms/hotspot/hotspotsettings.cpp @@ -11,12 +11,8 @@ K_PLUGIN_CLASS_WITH_JSON(HotspotSettings, "kcm_mobile_hotspot.json") -HotspotSettings::HotspotSettings(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args) - : KQuickConfigModule(parent, metaData, args) -{ -} - -HotspotSettings::~HotspotSettings() +HotspotSettings::HotspotSettings(QObject *parent, const KPluginMetaData &metaData) + : KQuickConfigModule(parent, metaData) { } diff --git a/kcms/hotspot/hotspotsettings.h b/kcms/hotspot/hotspotsettings.h index 9e7c8d69..f2ee5f8b 100644 --- a/kcms/hotspot/hotspotsettings.h +++ b/kcms/hotspot/hotspotsettings.h @@ -13,8 +13,7 @@ class HotspotSettings : public KQuickConfigModule { Q_OBJECT public: - HotspotSettings(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args); - virtual ~HotspotSettings() override; + HotspotSettings(QObject *parent, const KPluginMetaData &metaData); }; #endif // HOTSPOTSETTINGS_H diff --git a/kcms/info/info.cpp b/kcms/info/info.cpp index 184e7d76..d4dfd75b 100644 --- a/kcms/info/info.cpp +++ b/kcms/info/info.cpp @@ -13,8 +13,8 @@ K_PLUGIN_CLASS_WITH_JSON(Info, "kcm_mobile_info.json") -Info::Info(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args) - : KQuickConfigModule(parent, metaData, args) +Info::Info(QObject *parent, const KPluginMetaData &metaData) + : KQuickConfigModule(parent, metaData) , 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 f56770a6..1dda1b26 100644 --- a/kcms/info/info.h +++ b/kcms/info/info.h @@ -24,7 +24,7 @@ class Info : public KQuickConfigModule HardwareInfo *hardwareInfo() const; public: - Info(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args); + Info(QObject *parent, const KPluginMetaData &metaData); Q_INVOKABLE void copyInfoToClipboard() const; diff --git a/kcms/mobileshell/kcm.cpp b/kcms/mobileshell/kcm.cpp index 2a071bfe..004461d8 100644 --- a/kcms/mobileshell/kcm.cpp +++ b/kcms/mobileshell/kcm.cpp @@ -9,8 +9,8 @@ K_PLUGIN_CLASS_WITH_JSON(KCMMobileShell, "kcm_mobileshell.json") -KCMMobileShell::KCMMobileShell(QObject *parent, const KPluginMetaData &data, const QVariantList &args) - : KQuickManagedConfigModule(parent, data, args) +KCMMobileShell::KCMMobileShell(QObject *parent, const KPluginMetaData &data) + : KQuickManagedConfigModule(parent, data) { setButtons({}); } diff --git a/kcms/mobileshell/kcm.h b/kcms/mobileshell/kcm.h index 538a87a6..8c444bb3 100644 --- a/kcms/mobileshell/kcm.h +++ b/kcms/mobileshell/kcm.h @@ -14,8 +14,7 @@ class KCMMobileShell : public KQuickManagedConfigModule Q_OBJECT public: - KCMMobileShell(QObject *parent, const KPluginMetaData &data, const QVariantList &args); - virtual ~KCMMobileShell() override = default; + KCMMobileShell(QObject *parent, const KPluginMetaData &data); Q_SIGNALS: void navigationPanelEnabledChanged(); diff --git a/kcms/powermanagement/mobilepower.cpp b/kcms/powermanagement/mobilepower.cpp index 0b7e8741..0aa316de 100644 --- a/kcms/powermanagement/mobilepower.cpp +++ b/kcms/powermanagement/mobilepower.cpp @@ -45,8 +45,8 @@ const QMap idxToMinutes = { {NEVER, 0}, }; -MobilePower::MobilePower(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args) - : KQuickConfigModule(parent, metaData, args) +MobilePower::MobilePower(QObject *parent, const KPluginMetaData &metaData) + : KQuickConfigModule(parent, metaData) , m_batteries{new BatteryModel(this)} , m_profilesConfig{KSharedConfig::openConfig("powermanagementprofilesrc", KConfig::SimpleConfig | KConfig::CascadeConfig)} { @@ -58,8 +58,6 @@ MobilePower::MobilePower(QObject *parent, const KPluginMetaData &metaData, const load(); } -MobilePower::~MobilePower() = default; - // contents of powermanagementprofilesrc // // [Battery][SuspendSession] // our LockScreen diff --git a/kcms/powermanagement/mobilepower.h b/kcms/powermanagement/mobilepower.h index 580059ed..70148216 100644 --- a/kcms/powermanagement/mobilepower.h +++ b/kcms/powermanagement/mobilepower.h @@ -18,8 +18,7 @@ class MobilePower : public KQuickConfigModule Q_PROPERTY(int suspendSessionIdx READ suspendSessionIdx WRITE setSuspendSessionIdx NOTIFY suspendSessionIdxChanged) public: - MobilePower(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args); - ~MobilePower(); + MobilePower(QObject *parent, const KPluginMetaData &metaData); Q_INVOKABLE QStringList timeOptions() const; diff --git a/kcms/time/timesettings.cpp b/kcms/time/timesettings.cpp index 975deede..b15c85a3 100644 --- a/kcms/time/timesettings.cpp +++ b/kcms/time/timesettings.cpp @@ -31,10 +31,10 @@ #define FORMAT24H "HH:mm:ss" #define FORMAT12H "h:mm:ss ap" -K_PLUGIN_FACTORY_WITH_JSON(TimeSettingsFactory, "kcm_mobile_time.json", registerPlugin();) +K_PLUGIN_CLASS_WITH_JSON(TimeSettings, "kcm_mobile_time.json") -TimeSettings::TimeSettings(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args) - : KQuickConfigModule(parent, metaData, args) +TimeSettings::TimeSettings(QObject *parent, const KPluginMetaData &metaData) + : KQuickConfigModule(parent, metaData) , m_useNtp(true) { qDebug() << "time settings init"; @@ -51,10 +51,6 @@ TimeSettings::TimeSettings(QObject *parent, const KPluginMetaData &metaData, con qDebug() << "TimeSettings module loaded."; } -TimeSettings::~TimeSettings() -{ -} - void TimeSettings::initTimeZones() { auto *filterModel = new TimeZoneFilterProxy(this); diff --git a/kcms/time/timesettings.h b/kcms/time/timesettings.h index 7137d60e..c3cc8248 100644 --- a/kcms/time/timesettings.h +++ b/kcms/time/timesettings.h @@ -48,14 +48,7 @@ class TimeSettings : public KQuickConfigModule Q_PROPERTY(QString errorString READ errorString NOTIFY errorStringChanged) public: - /** - * @name Settings Module Constructor - * - * @arg parent The parent object - * @arg list Arguments, currently unused - */ - TimeSettings(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args); - ~TimeSettings() override; + TimeSettings(QObject *parent, const KPluginMetaData &metaData); QString currentTimeText(); QTime currentTime() const; diff --git a/kcms/virtualkeyboard/virtualkeyboard.cpp b/kcms/virtualkeyboard/virtualkeyboard.cpp index 48b51a01..7be811f7 100644 --- a/kcms/virtualkeyboard/virtualkeyboard.cpp +++ b/kcms/virtualkeyboard/virtualkeyboard.cpp @@ -28,8 +28,8 @@ K_PLUGIN_CLASS_WITH_JSON(VirtualKeyboard, "kcm_mobile_onscreenkeyboard.json") -VirtualKeyboard::VirtualKeyboard(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args) - : KQuickConfigModule(parent, metaData, args) +VirtualKeyboard::VirtualKeyboard(QObject *parent, const KPluginMetaData &metaData) + : KQuickConfigModule(parent, metaData) , 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 2a7f1105..10d9ec20 100644 --- a/kcms/virtualkeyboard/virtualkeyboard.h +++ b/kcms/virtualkeyboard/virtualkeyboard.h @@ -28,7 +28,7 @@ class VirtualKeyboard : public KQuickConfigModule Q_PROPERTY(bool vibrateFeedback MEMBER m_vibrateFeedback WRITE setVibrateFeedback NOTIFY vibrateFeedbackChanged) public: - VirtualKeyboard(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args); + VirtualKeyboard(QObject *parent, const KPluginMetaData &metaData); void setSpellCheck(bool enabled); void setAutoCapitalize(bool enabled); diff --git a/kcms/wifi/wifisettings.cpp b/kcms/wifi/wifisettings.cpp index 90359dd3..9699e1c3 100644 --- a/kcms/wifi/wifisettings.cpp +++ b/kcms/wifi/wifisettings.cpp @@ -25,12 +25,8 @@ K_PLUGIN_CLASS_WITH_JSON(WifiSettings, "kcm_mobile_wifi.json") -WifiSettings::WifiSettings(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args) - : KQuickConfigModule(parent, metaData, args) -{ -} - -WifiSettings::~WifiSettings() +WifiSettings::WifiSettings(QObject *parent, const KPluginMetaData &metaData) + : KQuickConfigModule(parent, metaData) { } diff --git a/kcms/wifi/wifisettings.h b/kcms/wifi/wifisettings.h index c927b735..c9e9bbfe 100644 --- a/kcms/wifi/wifisettings.h +++ b/kcms/wifi/wifisettings.h @@ -13,14 +13,13 @@ class WifiSettings : public KQuickConfigModule { Q_OBJECT public: - WifiSettings(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args); + WifiSettings(QObject *parent, const KPluginMetaData &metaData); Q_INVOKABLE QVariantMap getConnectionSettings(const QString &connection, const QString &type); Q_INVOKABLE QVariantMap getActiveConnectionInfo(const QString &connection); Q_INVOKABLE void addConnectionFromQML(const QVariantMap &QMLmap); Q_INVOKABLE void updateConnectionFromQML(const QString &path, const QVariantMap &map); Q_INVOKABLE QString getAccessPointDevice(); Q_INVOKABLE QString getAccessPointConnection(); - virtual ~WifiSettings(); }; #endif // WIFISETTINGS_H