jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

correct compilation error due to new dbus types

Browse Source
This commit is contained in:
Emmanuel Milou
2008-10-07 11:03:29 -04:00
parent a6987a21df
commit c2c032f6f6
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dbus/callmanager.cpp
View File

@ -113,8 +113,8 @@ CallManager::getVolume( const std::string& device )
return 0;
}
std::map< ::DBus::String, ::DBus::String >
CallManager::getCallDetails( const ::DBus::String& callID UNUSED )
std::map< std::string, std::string >
CallManager::getCallDetails( const std::string& callID UNUSED )
{
_debug("CallManager::getCallDetails received\n");
std::map<std::string, std::string> a;

10
src/dbus/configurationmanager.cpp
View File

@ -80,7 +80,7 @@ ConfigurationManager::getAccountList( )
std::vector< std::string >
ConfigurationManager::getToneLocaleList( )
{
std::vector< ::DBus::String > ret;
std::vector< std::string > ret;
_debug("ConfigurationManager::getToneLocaleList received\n");
return ret;
}
@ -90,7 +90,7 @@ ConfigurationManager::getToneLocaleList( )
std::string
ConfigurationManager::getVersion( )
{
::DBus::String ret("");
std::string ret("");
_debug("ConfigurationManager::getVersion received\n");
return ret;
@ -100,7 +100,7 @@ ConfigurationManager::getVersion( )
std::vector< std::string >
ConfigurationManager::getRingtoneList( )
{
std::vector< ::DBus::String > ret;
std::vector< std::string > ret;
_debug("ConfigurationManager::getRingtoneList received\n");
return ret;
}
@ -212,7 +212,7 @@ ConfigurationManager::getCurrentAudioOutputPlugin( void )
std::vector< std::string >
ConfigurationManager::getPlaybackDeviceList( )
{
std::vector< ::DBus::String > ret;
std::vector< std::string > ret;
_debug("ConfigurationManager::getPlaybackDeviceList received\n");
return ret;
}
@ -220,7 +220,7 @@ ConfigurationManager::getPlaybackDeviceList( )
std::vector< std::string >
ConfigurationManager::getRecordDeviceList( )
{
std::vector< ::DBus::String > ret;
std::vector< std::string > ret;
_debug("ConfigurationManager::getRecordDeviceList received\n");
return ret;

12
src/dbus/contactmanager.cpp
View File

@ -22,28 +22,28 @@
const char* ContactManager::SERVER_PATH = "/org/sflphone/SFLphone/ContactManager";
std::map< ::DBus::String, ::DBus::String >
ContactManager::getContacts( const ::DBus::String& accountID UNUSED)
std::map< std::string, std::string >
ContactManager::getContacts( const std::string& accountID UNUSED)
{
// TODO
std::map< ::DBus::String, ::DBus::String > ret;
std::map< std::string, std::string > ret;
return ret;
}
void
ContactManager::setContacts( const ::DBus::String& accountID UNUSED, const std::map< ::DBus::String UNUSED, ::DBus::String >& details UNUSED)
ContactManager::setContacts( const std::string& accountID UNUSED, const std::map< std::string UNUSED, std::string >& details UNUSED)
{
// TODO
}
void
ContactManager::setPresence( const ::DBus::String& accountID UNUSED, const ::DBus::String& presence UNUSED, const ::DBus::String& additionalInfo UNUSED)
ContactManager::setPresence( const std::string& accountID UNUSED, const std::string& presence UNUSED, const std::string& additionalInfo UNUSED)
{
// TODO
}
void
ContactManager::setContactPresence( const ::DBus::String& accountID UNUSED, const ::DBus::String& presence UNUSED, const ::DBus::String& additionalInfo UNUSED)
ContactManager::setContactPresence( const std::string& accountID UNUSED, const std::string& presence UNUSED, const std::string& additionalInfo UNUSED)
{
// TODO
}

6
src/dbus/instance.cpp
View File

@ -29,8 +29,8 @@ Instance::Instance( DBus::Connection& connection )
}
void
Instance::Register( const ::DBus::Int32& pid UNUSED,
const ::DBus::String& name UNUSED)
Instance::Register( const int32_t& pid UNUSED,
const std::string& name UNUSED)
{
_debug("Instance::register received\n");
count++;
@ -38,7 +38,7 @@ Instance::Register( const ::DBus::Int32& pid UNUSED,
void
Instance::Unregister( const ::DBus::Int32& pid UNUSED)
Instance::Unregister( const int32_t& pid UNUSED)
{
_debug("Instance::unregister received\n");
count --;