mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 14:23:09 +00:00
Remove unneeded QVariantList from KCM constructor args
The args are not needed and will be removed later in KF6
This commit is contained in:
parent
5479e29bd6
commit
0989b762f1
16 changed files with 25 additions and 50 deletions
|
|
@ -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{}
|
||||
{
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ class CellularNetworkSettings : public KQuickConfigModule
|
|||
Q_PROPERTY(QList<InlineMessage *> messages READ messages NOTIFY messagesChanged)
|
||||
|
||||
public:
|
||||
CellularNetworkSettings(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args);
|
||||
CellularNetworkSettings(QObject *parent, const KPluginMetaData &metaData);
|
||||
|
||||
static CellularNetworkSettings *instance();
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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({});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@ const QMap<int, qreal> 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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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<TimeSettings>();)
|
||||
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);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue