tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GIT_SILENT: Adapt to KConfigGroup name officially being a QString type

Browse source
This commit is contained in:
Laurent Montel 2023-11-06 20:05:39 +01:00
parent 8595b6ef88
commit b61f32262e
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/device.cpp
View file

@ -427,7 +427,7 @@ void Device::setPluginEnabled(const QString &pluginName, bool enabled)
return; return;
} }
KConfigGroup pluginStates = KSharedConfig::openConfig(pluginsConfigFile())->group("Plugins"); KConfigGroup pluginStates = KSharedConfig::openConfig(pluginsConfigFile())->group(QStringLiteral("Plugins"));
const QString enabledKey = pluginName + QStringLiteral("Enabled"); const QString enabledKey = pluginName + QStringLiteral("Enabled");
pluginStates.writeEntry(enabledKey, enabled); pluginStates.writeEntry(enabledKey, enabled);
@ -437,7 +437,7 @@ void Device::setPluginEnabled(const QString &pluginName, bool enabled)
bool Device::isPluginEnabled(const QString &pluginName) const bool Device::isPluginEnabled(const QString &pluginName) const
{ {
const QString enabledKey = pluginName + QStringLiteral("Enabled"); const QString enabledKey = pluginName + QStringLiteral("Enabled");
KConfigGroup pluginStates = KSharedConfig::openConfig(pluginsConfigFile())->group("Plugins"); KConfigGroup pluginStates = KSharedConfig::openConfig(pluginsConfigFile())->group(QStringLiteral("Plugins"));
return (pluginStates.hasKey(enabledKey) ? pluginStates.readEntry(enabledKey, false) return (pluginStates.hasKey(enabledKey) ? pluginStates.readEntry(enabledKey, false)
: PluginLoader::instance()->getPluginInfo(pluginName).isEnabledByDefault()); : PluginLoader::instance()->getPluginInfo(pluginName).isEnabledByDefault());

4
interfaces/pluginmodel.cpp
View file

@ -46,7 +46,7 @@ QVariant PluginModel::data(const QModelIndex &index, int role) const
switch (role) { switch (role) {
case Qt::CheckStateRole: { case Qt::CheckStateRole: {
const QString def = pluginEntry.isEnabledByDefault() ? QStringLiteral("true") : QStringLiteral("false"); const QString def = pluginEntry.isEnabledByDefault() ? QStringLiteral("true") : QStringLiteral("false");
return m_config->group("Plugins").readEntry(QStringLiteral("%1Enabled").arg(pluginEntry.pluginId()), def) == QStringLiteral("true"); return m_config->group(QStringLiteral("Plugins")).readEntry(QStringLiteral("%1Enabled").arg(pluginEntry.pluginId()), def) == QStringLiteral("true");
} }
case Qt::DisplayRole: case Qt::DisplayRole:
return pluginEntry.name(); return pluginEntry.name();
@ -91,7 +91,7 @@ bool PluginModel::setData(const QModelIndex &index, const QVariant &value, int r
if (role == Qt::CheckStateRole) { if (role == Qt::CheckStateRole) {
const KPluginMetaData &pluginEntry = m_plugins[index.row()]; const KPluginMetaData &pluginEntry = m_plugins[index.row()];
m_config->group("Plugins").writeEntry(QStringLiteral("%1Enabled").arg(pluginEntry.pluginId()), value); m_config->group(QStringLiteral("Plugins")).writeEntry(QStringLiteral("%1Enabled").arg(pluginEntry.pluginId()), value);
ret = true; ret = true;
} }

2
kcm/kcm.cpp
View file

@ -204,7 +204,7 @@ void KdeConnectKcm::resetDeviceView()
kcmUi.pluginSelector->clear(); kcmUi.pluginSelector->clear();
kcmUi.pluginSelector->setConfigurationArguments({currentDevice->id()}); kcmUi.pluginSelector->setConfigurationArguments({currentDevice->id()});
kcmUi.pluginSelector->addPlugins(availablePluginInfo, i18n("Available plugins")); kcmUi.pluginSelector->addPlugins(availablePluginInfo, i18n("Available plugins"));
kcmUi.pluginSelector->setConfig(deviceConfig->group("Plugins")); kcmUi.pluginSelector->setConfig(deviceConfig->group(QStringLiteral("Plugins")));
} }
void KdeConnectKcm::requestPairing() void KdeConnectKcm::requestPairing()