From 1d6a6c7643925adbb9d75eb0bc0b874c1b00f768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Thu, 6 May 2021 16:57:48 -0400
Subject: [PATCH] lrc: remove RING_ prefix
Change-Id: I6c14b2e2434a09c7f5b49e4e3510625980543494
---
src/newaccountmodel.cpp | 8 ++++----
src/newdevicemodel.cpp | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/newaccountmodel.cpp b/src/newaccountmodel.cpp
index 512dffd5..66b759de 100644
--- a/src/newaccountmodel.cpp
+++ b/src/newaccountmodel.cpp
@@ -812,8 +812,8 @@ account::Info::fromDetails(const MapStringString& details)
confProperties.password = details[ConfProperties::PASSWORD];
confProperties.realm = details[ConfProperties::REALM];
confProperties.localInterface = details[ConfProperties::LOCAL_INTERFACE];
- confProperties.deviceId = details[ConfProperties::RING_DEVICE_ID];
- confProperties.deviceName = details[ConfProperties::RING_DEVICE_NAME];
+ confProperties.deviceId = details[ConfProperties::DEVICE_ID];
+ confProperties.deviceName = details[ConfProperties::DEVICE_NAME];
confProperties.publishedSameAsLocal = toBool(details[ConfProperties::PUBLISHED_SAMEAS_LOCAL]);
confProperties.localPort = toInt(details[ConfProperties::LOCAL_PORT]);
confProperties.publishedPort = toInt(details[ConfProperties::PUBLISHED_PORT]);
@@ -928,8 +928,8 @@ account::ConfProperties_t::toDetails() const
details[ConfProperties::ROUTE] = this->routeset;
details[ConfProperties::PASSWORD] = this->password;
details[ConfProperties::REALM] = this->realm;
- details[ConfProperties::RING_DEVICE_ID] = this->deviceId;
- details[ConfProperties::RING_DEVICE_NAME] = this->deviceName;
+ details[ConfProperties::DEVICE_ID] = this->deviceId;
+ details[ConfProperties::DEVICE_NAME] = this->deviceName;
details[ConfProperties::LOCAL_INTERFACE] = this->localInterface;
details[ConfProperties::PUBLISHED_SAMEAS_LOCAL] = toQString(this->publishedSameAsLocal);
details[ConfProperties::LOCAL_PORT] = toQString(this->localPort);
diff --git a/src/newdevicemodel.cpp b/src/newdevicemodel.cpp
index 34fbc8b3..a4b5816d 100644
--- a/src/newdevicemodel.cpp
+++ b/src/newdevicemodel.cpp
@@ -121,7 +121,7 @@ NewDeviceModelPimpl::NewDeviceModelPimpl(const NewDeviceModel& linked,
{
const MapStringString aDetails = ConfigurationManager::instance().getAccountDetails(
linked.owner.id);
- currentDeviceId_ = aDetails.value(DRing::Account::ConfProperties::RING_DEVICE_ID);
+ currentDeviceId_ = aDetails.value(DRing::Account::ConfProperties::DEVICE_ID);
const MapStringString accountDevices = ConfigurationManager::instance().getKnownRingDevices(
linked.owner.id);
auto it = accountDevices.begin();
--
GitLab