Skip to content
Snippets Groups Projects
Commit 8327cdab authored by Vittorio Giovara's avatar Vittorio Giovara Committed by Tristan Matthews
Browse files

client: do not compile undefined types

Change-Id: I6c839bb4689f461b2ff5954e13af0fa7fe1f215c
Refs: #46447
parent b7b6eb36
No related branches found
No related tags found
No related merge requests found
...@@ -44,8 +44,10 @@ Client::Client() : callManager_(new CallManager) ...@@ -44,8 +44,10 @@ Client::Client() : callManager_(new CallManager)
#ifdef SFL_PRESENCE #ifdef SFL_PRESENCE
, presenceManager_(new PresenceManager) , presenceManager_(new PresenceManager)
#endif #endif
#if HAVE_DBUS
, instanceManager_(0) , instanceManager_(0)
, dispatcher_(0) , dispatcher_(0)
#endif
#ifdef SFL_VIDEO #ifdef SFL_VIDEO
, videoControls_(0) , videoControls_(0)
#endif #endif
...@@ -62,8 +64,10 @@ Client::~Client() ...@@ -62,8 +64,10 @@ Client::~Client()
#ifdef SFL_VIDEO #ifdef SFL_VIDEO
delete videoControls_; delete videoControls_;
#endif #endif
#if HAVE_DBUS
delete dispatcher_; delete dispatcher_;
delete instanceManager_; delete instanceManager_;
#endif
delete configurationManager_; delete configurationManager_;
#ifdef SFL_PRESENCE #ifdef SFL_PRESENCE
delete presenceManager_; delete presenceManager_;
......
...@@ -49,9 +49,11 @@ class PresenceManager; ...@@ -49,9 +49,11 @@ class PresenceManager;
class VideoControls; class VideoControls;
#endif #endif
#if HAVE_DBUS
namespace DBus { namespace DBus {
class BusDispatcher; class BusDispatcher;
} }
#endif
class Client { class Client {
public: public:
...@@ -80,8 +82,10 @@ class Client { ...@@ -80,8 +82,10 @@ class Client {
#ifdef SFL_PRESENCE #ifdef SFL_PRESENCE
PresenceManager* presenceManager_; PresenceManager* presenceManager_;
#endif #endif
#if HAVE_DBUS
Instance* instanceManager_; Instance* instanceManager_;
DBus::BusDispatcher* dispatcher_; DBus::BusDispatcher* dispatcher_;
#endif
#ifdef SFL_VIDEO #ifdef SFL_VIDEO
VideoControls *videoControls_; VideoControls *videoControls_;
#endif #endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment