From 9d20b5812d701a36529458825bb09b749e155473 Mon Sep 17 00:00:00 2001 From: Tristan Matthews <tristan.matthews@savoirfairelinux.com> Date: Tue, 16 Jul 2013 15:21:26 -0400 Subject: [PATCH] * #26839: client: move callmanager.h into client --- daemon/src/audio/audioloop.cpp | 2 +- .../audio/audiortp/zrtp_session_callback.cpp | 2 +- daemon/src/client/{dbus => }/callmanager.h | 26 +++++++++++++++---- daemon/src/client/dbus/Makefile.am | 2 +- daemon/src/managerimpl.cpp | 2 +- daemon/src/sip/sipvoiplink.cpp | 2 +- 6 files changed, 26 insertions(+), 10 deletions(-) rename daemon/src/client/{dbus => }/callmanager.h (94%) diff --git a/daemon/src/audio/audioloop.cpp b/daemon/src/audio/audioloop.cpp index 857259f421..46d29c28cd 100644 --- a/daemon/src/audio/audioloop.cpp +++ b/daemon/src/audio/audioloop.cpp @@ -34,7 +34,7 @@ #include "audioloop.h" #include "manager.h" -#include "client/dbus/callmanager.h" +#include "client/callmanager.h" #include <cmath> #include <numeric> #include <cstring> diff --git a/daemon/src/audio/audiortp/zrtp_session_callback.cpp b/daemon/src/audio/audiortp/zrtp_session_callback.cpp index b2c502a5f3..4106c7401d 100644 --- a/daemon/src/audio/audiortp/zrtp_session_callback.cpp +++ b/daemon/src/audio/audiortp/zrtp_session_callback.cpp @@ -31,7 +31,7 @@ #include "logger.h" #include "sip/sipcall.h" #include "client/client.h" -#include "client/dbus/callmanager.h" +#include "client/callmanager.h" #include "manager.h" #include <cstdlib> diff --git a/daemon/src/client/dbus/callmanager.h b/daemon/src/client/callmanager.h similarity index 94% rename from daemon/src/client/dbus/callmanager.h rename to daemon/src/client/callmanager.h index e99a72b6b0..4f47ebfc58 100644 --- a/daemon/src/client/dbus/callmanager.h +++ b/daemon/src/client/callmanager.h @@ -31,7 +31,14 @@ #ifndef __SFL_CALLMANAGER_H__ #define __SFL_CALLMANAGER_H__ -#include "dbus_cpp.h" +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#if HAVE_DBUS + +#include "dbus/dbus_cpp.h" + #if __GNUC__ >= 4 && __GNUC_MINOR__ >= 6 /* This warning option only exists for gcc 4.6.0 and greater. */ #pragma GCC diagnostic ignored "-Wunused-but-set-variable" @@ -39,7 +46,7 @@ #pragma GCC diagnostic ignored "-Wignored-qualifiers" #pragma GCC diagnostic ignored "-Wunused-parameter" -#include "callmanager-glue.h" +#include "dbus/callmanager-glue.h" #pragma GCC diagnostic warning "-Wignored-qualifiers" #pragma GCC diagnostic warning "-Wunused-parameter" @@ -48,25 +55,34 @@ #pragma GCC diagnostic warning "-Wunused-but-set-variable" #endif +#endif // HAVE_DBUS + #include <stdexcept> class CallManagerException: public std::runtime_error { public: - CallManagerException(const std::string& str="") : + CallManagerException(const std::string& str = "") : std::runtime_error("A CallManagerException occured: " + str) {} }; namespace sfl { - class AudioZrtpSession; +class AudioZrtpSession; } class CallManager +#if HAVE_DBUS : public org::sflphone::SFLphone::CallManager_adaptor, public DBus::IntrospectableAdaptor, - public DBus::ObjectAdaptor { + public DBus::ObjectAdaptor +#endif +{ public: +#if HAVE_DBUS CallManager(DBus::Connection& connection); +#else + CallManager(); +#endif /* methods exported by this interface, * you will have to implement them in your ObjectAdaptor diff --git a/daemon/src/client/dbus/Makefile.am b/daemon/src/client/dbus/Makefile.am index 3fb1b4f646..2064c9ae47 100644 --- a/daemon/src/client/dbus/Makefile.am +++ b/daemon/src/client/dbus/Makefile.am @@ -49,7 +49,7 @@ libclient_la_CXXFLAGS = -I../ \ noinst_HEADERS = \ - callmanager.h \ + ../callmanager.h \ configurationmanager.h \ instance.h \ ../client.h \ diff --git a/daemon/src/managerimpl.cpp b/daemon/src/managerimpl.cpp index d73d389b12..bf674db4b5 100644 --- a/daemon/src/managerimpl.cpp +++ b/daemon/src/managerimpl.cpp @@ -71,7 +71,7 @@ #ifndef __ANDROID__ #include "client/dbus/configurationmanager.h" -#include "client/dbus/callmanager.h" +#include "client/callmanager.h" #else #include "client/android/configurationmanager.h" #include "client/android/callmanager.h" diff --git a/daemon/src/sip/sipvoiplink.cpp b/daemon/src/sip/sipvoiplink.cpp index 8cf53ae4d7..8694bcab5c 100644 --- a/daemon/src/sip/sipvoiplink.cpp +++ b/daemon/src/sip/sipvoiplink.cpp @@ -73,7 +73,7 @@ #include "client/android/callmanager.h" #else #include "client/client.h" -#include "client/dbus/callmanager.h" +#include "client/callmanager.h" #include "client/dbus/configurationmanager.h" #endif -- GitLab