From a3f9cd7bd29e7bb965f18200b0e405de9fb8dfa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Wed, 22 Apr 2015 16:11:54 -0400
Subject: [PATCH] api: remove unused methods
Refs #71525
Change-Id: I11b8629fa42e4fbf413dde14493dccd2c4944242
---
bin/dbus/configurationmanager-introspec.xml | 12 ---------
bin/dbus/dbusconfigurationmanager.cpp | 12 ---------
bin/dbus/dbusconfigurationmanager.h | 2 --
src/client/configurationmanager.cpp | 27 ---------------------
src/dring/configurationmanager_interface.h | 2 --
5 files changed, 55 deletions(-)
diff --git a/bin/dbus/configurationmanager-introspec.xml b/bin/dbus/configurationmanager-introspec.xml
index 5b898cf7e1..4b6cd1b994 100644
--- a/bin/dbus/configurationmanager-introspec.xml
+++ b/bin/dbus/configurationmanager-introspec.xml
@@ -635,18 +635,6 @@
</arg>
</method>
- <method name="getTlsSettings" tp:name-for-bindings="getTlsSettings">
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
- <arg type="a{ss}" name="details" direction="out">
- </arg>
- </method>
-
- <method name="setTlsSettings" tp:name-for-bindings="setTlsSettings">
- <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="MapStringString"/>
- <arg type="a{ss}" name="details" direction="in">
- </arg>
- </method>
-
<method name="validateCertificate" tp:name-for-bindings="validateCertificate">
<arg type="s" name="accountId" direction="in"></arg>
<arg type="s" name="certificatePath" direction="in">
diff --git a/bin/dbus/dbusconfigurationmanager.cpp b/bin/dbus/dbusconfigurationmanager.cpp
index 3697a2947c..3af2927c0b 100644
--- a/bin/dbus/dbusconfigurationmanager.cpp
+++ b/bin/dbus/dbusconfigurationmanager.cpp
@@ -364,12 +364,6 @@ DBusConfigurationManager::setHookSettings(const std::map<std::string, std::strin
DRing::setHookSettings(settings);
}
-auto
-DBusConfigurationManager::getTlsSettings() -> decltype(DRing::getTlsSettings())
-{
- return DRing::getTlsSettings();
-}
-
auto
DBusConfigurationManager::validateCertificate(const std::string& accountId, const std::string& certificate, const std::string& privateKey) -> decltype(DRing::validateCertificate(accountId, certificate, privateKey))
{
@@ -394,12 +388,6 @@ DBusConfigurationManager::getCertificateDetailsRaw(const std::vector<uint8_t>& c
return DRing::getCertificateDetailsRaw(certificate);
}
-void
-DBusConfigurationManager::setTlsSettings(const std::map<std::string, std::string>& details)
-{
- DRing::setTlsSettings(details);
-}
-
auto
DBusConfigurationManager::getIp2IpDetails() -> decltype(DRing::getIp2IpDetails())
{
diff --git a/bin/dbus/dbusconfigurationmanager.h b/bin/dbus/dbusconfigurationmanager.h
index 3351b9e7f7..f85351f4fa 100644
--- a/bin/dbus/dbusconfigurationmanager.h
+++ b/bin/dbus/dbusconfigurationmanager.h
@@ -117,8 +117,6 @@ class DBusConfigurationManager :
void setAccountsOrder(const std::string& order);
std::map<std::string, std::string> getHookSettings();
void setHookSettings(const std::map<std::string, std::string>& settings);
- std::map<std::string, std::string> getTlsSettings();
- void setTlsSettings(const std::map<std::string, std::string>& details);
std::map<std::string, std::string> getIp2IpDetails();
std::vector<std::map<std::string, std::string>> getCredentials(const std::string& accountID);
void setCredentials(const std::string& accountID, const std::vector<std::map<std::string, std::string>>& details);
diff --git a/src/client/configurationmanager.cpp b/src/client/configurationmanager.cpp
index 98be0b14c4..c947b803cb 100644
--- a/src/client/configurationmanager.cpp
+++ b/src/client/configurationmanager.cpp
@@ -130,33 +130,6 @@ getTlsDefaultSettings()
};
}
-std::map<std::string, std::string>
-getTlsSettings()
-{
- auto account = ring::Manager::instance().getIP2IPAccount();
- if (auto sipaccount = static_cast<SIPAccount*>(account.get()))
- return sipaccount->getTlsSettings();
- RING_ERR("Could not find IP2IP account");
- return std::map<std::string, std::string>();
-}
-
-void
-setTlsSettings(const std::map<std::string, std::string>& details)
-{
- auto account = ring::Manager::instance().getIP2IPAccount();
- if (auto sipaccount = static_cast<SIPAccount*>(account.get())) {
- sipaccount->setTlsSettings(details);
- ring::Manager::instance().saveConfig();
- // FIXME: inefficient api, don't pass details (not as ref nor copy)
- // let client requiests them we needed.
- ring::emitSignal<ConfigurationSignal::VolatileDetailsChanged>(account->getAccountID(),
- details);
- }
-
- RING_DBG("No valid account in set TLS settings");
- return;
-}
-
std::map<std::string, std::string>
validateCertificate(const std::string&,
const std::string& certificate,
diff --git a/src/dring/configurationmanager_interface.h b/src/dring/configurationmanager_interface.h
index 21716a26e7..952251a9c2 100644
--- a/src/dring/configurationmanager_interface.h
+++ b/src/dring/configurationmanager_interface.h
@@ -111,8 +111,6 @@ void setAccountsOrder(const std::string& order);
std::map<std::string, std::string> getHookSettings();
void setHookSettings(const std::map<std::string, std::string>& settings);
-std::map<std::string, std::string> getTlsSettings();
-void setTlsSettings(const std::map<std::string, std::string>& details);
std::map<std::string, std::string> getIp2IpDetails();
std::vector<std::map<std::string, std::string>> getCredentials(const std::string& accountID);
--
GitLab