refs #485 removed some dependencies from CDBusServer

This commit is contained in:
Klaus Basan
2016-02-16 03:41:18 +01:00
committed by Mathew Sutcliffe
parent a0b7f741ee
commit 1b587c2ee8
17 changed files with 41 additions and 31 deletions

View File

@@ -22,7 +22,6 @@
#include "blackcore/actionbind.h"
#include "blackinput/keyboard.h"
#include "blackcore/settings/audio.h"
#include "blackmisc/dbusserver.h"
#include "blackmisc/audio/voiceroomlist.h"
#include <QThread>
@@ -30,6 +29,7 @@
#include <QPointer>
#include <QScopedPointer>
namespace BlackMisc { class CDBusServer; }
namespace BlackCore
{
class IVoiceChannel;
@@ -44,7 +44,6 @@ namespace BlackCore
friend class IContextAudio;
public:
//! Destructor
virtual ~CContextAudio();
@@ -122,12 +121,7 @@ namespace BlackCore
CContextAudio(CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime);
//! Register myself in DBus
CContextAudio *registerWithDBus(BlackMisc::CDBusServer *server)
{
if (!server || this->m_mode != CCoreFacadeConfig::LocalInDbusServer) { return this; }
server->addObject(IContextAudio::ObjectPath(), this);
return this;
}
CContextAudio *registerWithDBus(BlackMisc::CDBusServer *server);
private slots: