Skip to content
Snippets Groups Projects
Commit 679ad50d authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #6718: confmanager: removed more unused methods

parent ee2b5e6c
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
daemon/src/dbus/configurationmanager-introspec.xml
+ 0
− 29
View file @ 679ad50d
...@@ -223,35 +223,6 @@ ...@@ -223,35 +223,6 @@
</arg> </arg>
</method> </method>
<method name="getToneLocaleList" tp:name-for-bindings="getToneLocaleList">
<tp:docstring>
</tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
<tp:docstring>
</tp:docstring>
</arg>
</method>
<method name="getVersion" tp:name-for-bindings="getVersion">
<tp:docstring>
</tp:docstring>
<arg type="s" name="version" direction="out">
<tp:docstring>
</tp:docstring>
</arg>
</method>
<method name="getRingtoneList" tp:name-for-bindings="getRingtoneList">
<tp:docstring>
</tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
<tp:docstring>
</tp:docstring>
</arg>
</method>
<method name="getPlaybackDeviceList" tp:name-for-bindings="getPlaybackDeviceList"> <method name="getPlaybackDeviceList" tp:name-for-bindings="getPlaybackDeviceList">
<tp:docstring> <tp:docstring>
</tp:docstring> </tp:docstring>
......
daemon/src/dbus/configurationmanager.cpp
+ 14
− 35
View file @ 679ad50d
...@@ -121,20 +121,20 @@ std::map<std::string, std::string> ConfigurationManager::getTlsSettings() ...@@ -121,20 +121,20 @@ std::map<std::string, std::string> ConfigurationManager::getTlsSettings()
std::stringstream portstr; std::stringstream portstr;
portstr << sipaccount->getTlsListenerPort(); portstr << sipaccount->getTlsListenerPort();
tlsSettings.insert (std::pair<std::string, std::string> (TLS_LISTENER_PORT, portstr.str())); tlsSettings[TLS_LISTENER_PORT] = portstr.str();
tlsSettings.insert (std::pair<std::string, std::string> (TLS_ENABLE, sipaccount->getTlsEnable())); tlsSettings[TLS_ENABLE] = sipaccount->getTlsEnable();
tlsSettings.insert (std::pair<std::string, std::string> (TLS_CA_LIST_FILE, sipaccount->getTlsCaListFile())); tlsSettings[TLS_CA_LIST_FILE] = sipaccount->getTlsCaListFile();
tlsSettings.insert (std::pair<std::string, std::string> (TLS_CERTIFICATE_FILE, sipaccount->getTlsCertificateFile())); tlsSettings[TLS_CERTIFICATE_FILE] = sipaccount->getTlsCertificateFile();
tlsSettings.insert (std::pair<std::string, std::string> (TLS_PRIVATE_KEY_FILE, sipaccount->getTlsPrivateKeyFile())); tlsSettings[TLS_PRIVATE_KEY_FILE] = sipaccount->getTlsPrivateKeyFile();
tlsSettings.insert (std::pair<std::string, std::string> (TLS_PASSWORD, sipaccount->getTlsPassword())); tlsSettings[TLS_PASSWORD] = sipaccount->getTlsPassword();
tlsSettings.insert (std::pair<std::string, std::string> (TLS_METHOD, sipaccount->getTlsMethod())); tlsSettings[TLS_METHOD] = sipaccount->getTlsMethod();
tlsSettings.insert (std::pair<std::string, std::string> (TLS_CIPHERS, sipaccount->getTlsCiphers())); tlsSettings[TLS_CIPHERS] = sipaccount->getTlsCiphers();
tlsSettings.insert (std::pair<std::string, std::string> (TLS_SERVER_NAME, sipaccount->getTlsServerName())); tlsSettings[TLS_SERVER_NAME] = sipaccount->getTlsServerName();
tlsSettings.insert (std::pair<std::string, std::string> (TLS_VERIFY_SERVER, sipaccount->getTlsVerifyServer() ? "true" : "false")); tlsSettings[TLS_VERIFY_SERVER] = sipaccount->getTlsVerifyServer() ? "true" : "false";
tlsSettings.insert (std::pair<std::string, std::string> (TLS_VERIFY_CLIENT, sipaccount->getTlsVerifyClient() ? "true" : "false")); tlsSettings[TLS_VERIFY_CLIENT] = sipaccount->getTlsVerifyClient() ? "true" : "false";
tlsSettings.insert (std::pair<std::string, std::string> (TLS_REQUIRE_CLIENT_CERTIFICATE, sipaccount->getTlsRequireClientCertificate() ? "true" : "false")); tlsSettings[TLS_REQUIRE_CLIENT_CERTIFICATE] = sipaccount->getTlsRequireClientCertificate() ? "true" : "false";
tlsSettings.insert (std::pair<std::string, std::string> (TLS_NEGOTIATION_TIMEOUT_SEC, sipaccount->getTlsNegotiationTimeoutSec())); tlsSettings[TLS_NEGOTIATION_TIMEOUT_SEC] = sipaccount->getTlsNegotiationTimeoutSec();
tlsSettings.insert (std::pair<std::string, std::string> (TLS_NEGOTIATION_TIMEOUT_MSEC, sipaccount->getTlsNegotiationTimeoutMsec())); tlsSettings[TLS_NEGOTIATION_TIMEOUT_MSEC] = sipaccount->getTlsNegotiationTimeoutMsec();
return tlsSettings; return tlsSettings;
} }
...@@ -237,27 +237,6 @@ std::vector<std::string> ConfigurationManager::getAccountList() ...@@ -237,27 +237,6 @@ std::vector<std::string> ConfigurationManager::getAccountList()
return Manager::instance().getAccountList(); return Manager::instance().getAccountList();
} }
//TODO
std::vector<std::string> ConfigurationManager::getToneLocaleList()
{
std::vector<std::string> ret;
return ret;
}
//TODO
std::string ConfigurationManager::getVersion()
{
std::string ret ("");
return ret;
}
//TODO
std::vector<std::string> ConfigurationManager::getRingtoneList()
{
std::vector<std::string> ret;
return ret;
}
/** /**
* Send the list of all codecs loaded to the client through DBus. * Send the list of all codecs loaded to the client through DBus.
* Can stay global, as only the active codecs will be set per accounts * Can stay global, as only the active codecs will be set per accounts
......
daemon/src/dbus/configurationmanager.h
+ 0
− 2
View file @ 679ad50d
...@@ -94,10 +94,8 @@ class ConfigurationManager ...@@ -94,10 +94,8 @@ class ConfigurationManager
void setEchoCancelDelay(const int32_t& length); void setEchoCancelDelay(const int32_t& length);
int getEchoCancelDelay(void); int getEchoCancelDelay(void);
std::vector< std::string > getToneLocaleList();
std::vector< std::string > getPlaybackDeviceList(); std::vector< std::string > getPlaybackDeviceList();
std::vector< std::string > getRecordDeviceList(); std::vector< std::string > getRecordDeviceList();
std::string getVersion();
std::vector< std::string > getRingtoneList(); std::vector< std::string > getRingtoneList();
int32_t getAudioManager (void); int32_t getAudioManager (void);
void setAudioManager (const int32_t& api); void setAudioManager (const int32_t& api);
......
gnome/src/dbus/configurationmanager-introspec.xml
+ 0
− 29
View file @ 679ad50d
...@@ -223,35 +223,6 @@ ...@@ -223,35 +223,6 @@
</arg> </arg>
</method> </method>
<method name="getToneLocaleList" tp:name-for-bindings="getToneLocaleList">
<tp:docstring>
</tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
<tp:docstring>
</tp:docstring>
</arg>
</method>
<method name="getVersion" tp:name-for-bindings="getVersion">
<tp:docstring>
</tp:docstring>
<arg type="s" name="version" direction="out">
<tp:docstring>
</tp:docstring>
</arg>
</method>
<method name="getRingtoneList" tp:name-for-bindings="getRingtoneList">
<tp:docstring>
</tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
<tp:docstring>
</tp:docstring>
</arg>
</method>
<method name="getPlaybackDeviceList" tp:name-for-bindings="getPlaybackDeviceList"> <method name="getPlaybackDeviceList" tp:name-for-bindings="getPlaybackDeviceList">
<tp:docstring> <tp:docstring>
</tp:docstring> </tp:docstring>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment