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

Use a different key for settings, so we don't clash with older versions.

Browse source
This commit is contained in:
Albert Vaca 2016-03-02 15:36:45 -08:00
parent 2f33fa0fc7
commit b1ef3f9fc9
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/kdeconnectconfig.cpp
View file

@ -39,6 +39,8 @@
#include "dbushelper.h" #include "dbushelper.h"
#include "daemon.h" #include "daemon.h"
static const QString TRUSTED_DEVICES = QStringLiteral("trusted_devices");
struct KdeConnectConfigPrivate { struct KdeConnectConfigPrivate {
// The Initializer object sets things up, and also does cleanup when it goes out of scope // The Initializer object sets things up, and also does cleanup when it goes out of scope
@ -212,7 +214,7 @@ QDir KdeConnectConfig::baseConfigDir()
QStringList KdeConnectConfig::trustedDevices() QStringList KdeConnectConfig::trustedDevices()
{ {
d->config->beginGroup("trustedDevices"); d->config->beginGroup(TRUSTED_DEVICES);
const QStringList& list = d->config->childGroups(); const QStringList& list = d->config->childGroups();
d->config->endGroup(); d->config->endGroup();
return list; return list;
@ -221,7 +223,7 @@ QStringList KdeConnectConfig::trustedDevices()
void KdeConnectConfig::addTrustedDevice(const QString &id, const QString &name, const QString &type) void KdeConnectConfig::addTrustedDevice(const QString &id, const QString &name, const QString &type)
{ {
d->config->beginGroup("trustedDevices"); d->config->beginGroup(TRUSTED_DEVICES);
d->config->beginGroup(id); d->config->beginGroup(id);
d->config->setValue("name", name); d->config->setValue("name", name);
d->config->setValue("type", type); d->config->setValue("type", type);
@ -234,7 +236,7 @@ void KdeConnectConfig::addTrustedDevice(const QString &id, const QString &name,
KdeConnectConfig::DeviceInfo KdeConnectConfig::getTrustedDevice(const QString &id) KdeConnectConfig::DeviceInfo KdeConnectConfig::getTrustedDevice(const QString &id)
{ {
d->config->beginGroup("trustedDevices"); d->config->beginGroup(TRUSTED_DEVICES);
d->config->beginGroup(id); d->config->beginGroup(id);
KdeConnectConfig::DeviceInfo info; KdeConnectConfig::DeviceInfo info;
@ -248,7 +250,7 @@ KdeConnectConfig::DeviceInfo KdeConnectConfig::getTrustedDevice(const QString &i
void KdeConnectConfig::removeTrustedDevice(const QString &deviceId) void KdeConnectConfig::removeTrustedDevice(const QString &deviceId)
{ {
d->config->beginGroup("trustedDevices"); d->config->beginGroup(TRUSTED_DEVICES);
d->config->beginGroup(deviceId); d->config->beginGroup(deviceId);
d->config->remove(QString()); d->config->remove(QString());
d->config->endGroup(); d->config->endGroup();
@ -260,7 +262,7 @@ void KdeConnectConfig::removeTrustedDevice(const QString &deviceId)
// Utility functions to set and get a value // Utility functions to set and get a value
void KdeConnectConfig::setDeviceProperty(QString deviceId, QString key, QString value) void KdeConnectConfig::setDeviceProperty(QString deviceId, QString key, QString value)
{ {
d->config->beginGroup("trustedDevices"); d->config->beginGroup(TRUSTED_DEVICES);
d->config->beginGroup(deviceId); d->config->beginGroup(deviceId);
d->config->setValue(key, value); d->config->setValue(key, value);
d->config->endGroup(); d->config->endGroup();
@ -271,7 +273,7 @@ void KdeConnectConfig::setDeviceProperty(QString deviceId, QString key, QString
QString KdeConnectConfig::getDeviceProperty(QString deviceId, QString key, QString defaultValue) QString KdeConnectConfig::getDeviceProperty(QString deviceId, QString key, QString defaultValue)
{ {
QString value; QString value;
d->config->beginGroup("trustedDevices"); d->config->beginGroup(TRUSTED_DEVICES);
d->config->beginGroup(deviceId); d->config->beginGroup(deviceId);
value = d->config->value(key, defaultValue).toString(); value = d->config->value(key, defaultValue).toString();
d->config->endGroup(); d->config->endGroup();