Commit 720ae97e authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #26839: client: move configurationmanager.h into client/

parent 9d20b581
......@@ -44,7 +44,7 @@
#include "manager.h"
#ifndef __ANDROID__
#include "client/dbus/configurationmanager.h"
#include "client/configurationmanager.h"
#else
#include "client/android/configurationmanager.h"
#include "client/android/jni_callbacks.h"
......
......@@ -37,7 +37,7 @@
#include "logger.h"
#include "manager.h"
#include "noncopyable.h"
#include "client/dbus/configurationmanager.h"
#include "client/configurationmanager.h"
#include <ctime>
#define SFL_ALSA_PERIOD_SIZE 160
......
......@@ -34,6 +34,14 @@
#ifndef CONFIGURATIONMANAGER_H
#define CONFIGURATIONMANAGER_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#if HAVE_DBUS
#include "dbus/dbus_cpp.h"
#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 6
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
......@@ -41,7 +49,7 @@
#pragma GCC diagnostic ignored "-Wignored-qualifiers"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Weffc++"
#include "configurationmanager-glue.h"
#include "dbus/configurationmanager-glue.h"
#pragma GCC diagnostic warning "-Wignored-qualifiers"
#pragma GCC diagnostic warning "-Wunused-parameter"
#pragma GCC diagnostic warning "-Weffc++"
......@@ -50,15 +58,21 @@
#pragma GCC diagnostic warning "-Wunused-but-set-variable"
#endif
#include "dbus_cpp.h"
#endif // HAVE_DBUS
class ConfigurationManager
#if HAVE_DBUS
: public org::sflphone::SFLphone::ConfigurationManager_adaptor,
public DBus::IntrospectableAdaptor,
public DBus::ObjectAdaptor {
public DBus::ObjectAdaptor
#endif
{
public:
#if HAVE_DBUS
ConfigurationManager(DBus::Connection& connection);
#else
ConfigurationManager();
#endif
std::map< std::string, std::string > getAccountDetails(const std::string& accountID);
void setAccountDetails(const std::string& accountID, const std::map< std::string, std::string >& details);
std::map<std::string, std::string> getAccountTemplate();
......
......@@ -50,7 +50,7 @@ libclient_la_CXXFLAGS = -I../ \
noinst_HEADERS = \
../callmanager.h \
configurationmanager.h \
../configurationmanager.h \
instance.h \
../client.h \
networkmanager_proxy.h \
......
......@@ -70,7 +70,7 @@
#include "manager.h"
#ifndef __ANDROID__
#include "client/dbus/configurationmanager.h"
#include "client/configurationmanager.h"
#include "client/callmanager.h"
#else
#include "client/android/configurationmanager.h"
......
......@@ -65,7 +65,7 @@
#endif
#ifndef __ANDROID__
#include "client/dbus/configurationmanager.h"
#include "client/configurationmanager.h"
#else
#include "client/android/configurationmanager.h"
#endif
......
......@@ -74,7 +74,7 @@
#else
#include "client/client.h"
#include "client/callmanager.h"
#include "client/dbus/configurationmanager.h"
#include "client/configurationmanager.h"
#endif
#include "pjsip/sip_endpoint.h"
......
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