Commit 1d323ca3 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #6718: confmanager: removed more unused methods

parent 9bdb348a
......@@ -223,26 +223,6 @@
</arg>
</method>
<method name="getPlaybackDeviceList" tp:name-for-bindings="getPlaybackDeviceList">
<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="getRecordDeviceList" tp:name-for-bindings="getRecordDeviceList">
<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="getAudioManager" tp:name-for-bindings="getAudioManager">
<tp:docstring>
</tp:docstring>
......
......@@ -32,6 +32,7 @@
#include <configurationmanager.h>
#include <sstream>
#include "config.h"
#include "../manager.h"
#include "sip/sipvoiplink.h"
#include "sip/sipaccount.h"
......@@ -414,31 +415,13 @@ void ConfigurationManager::setEchoCancelDelay(const int32_t& delay)
Manager::instance().setEchoCancelDelay(delay);
}
std::vector<std::string> ConfigurationManager::getPlaybackDeviceList()
{
std::vector<std::string> ret;
return ret;
}
std::vector<std::string> ConfigurationManager::getRecordDeviceList()
{
std::vector<std::string> ret;
return ret;
}
bool ConfigurationManager::isMd5CredentialHashing (void)
{
return Manager::instance().preferences.getMd5Hash();
}
void ConfigurationManager::setMd5CredentialHashing (const bool& enabled)
{
Manager::instance().preferences.setMd5Hash (enabled);
}
int32_t ConfigurationManager::isIax2Enabled (void)
{
return Manager::instance().isIax2Enabled();
#ifdef HAVE_IAX
return HAVE_IAX;
#else
return 0;
#endif
}
std::string ConfigurationManager::getRecordPath (void)
......
......@@ -94,14 +94,9 @@ class ConfigurationManager
void setEchoCancelDelay(const int32_t& length);
int getEchoCancelDelay(void);
std::vector< std::string > getPlaybackDeviceList();
std::vector< std::string > getRecordDeviceList();
std::vector< std::string > getRingtoneList();
int32_t getAudioManager (void);
void setAudioManager (const int32_t& api);
bool isMd5CredentialHashing (void);
void setMd5CredentialHashing (const bool& enabled);
int32_t isIax2Enabled (void);
std::string getRecordPath (void);
void setRecordPath (const std::string& recPath);
......
......@@ -2465,11 +2465,6 @@ std::vector<std::string> ManagerImpl::getCurrentAudioDevicesIndex ()
return v;
}
int ManagerImpl::isIax2Enabled (void)
{
return HAVE_IAX;
}
int ManagerImpl::isRingtoneEnabled (const std::string& id)
{
Account *account = getAccount (id);
......
......@@ -636,13 +636,6 @@ class ManagerImpl
static std::vector<std::string> unserialize (std::string v);
/**
* Tells if IAX2 support is enabled
* @return int 1 if IAX2 is enabled
* 0 otherwise
*/
int isIax2Enabled (void);
/**
* Ringtone option.
* If ringtone is enabled, ringtone on incoming call use custom choice. If not, only standart tone.
......
......@@ -223,26 +223,6 @@
</arg>
</method>
<method name="getPlaybackDeviceList" tp:name-for-bindings="getPlaybackDeviceList">
<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="getRecordDeviceList" tp:name-for-bindings="getRecordDeviceList">
<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="getAudioManager" tp:name-for-bindings="getAudioManager">
<tp:docstring>
</tp:docstring>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment