refs #520 Moved CDBusServer from BlackCore to BlackMisc.

This commit is contained in:
Mathew Sutcliffe
2015-11-28 02:25:56 +00:00
parent d35fc3f056
commit fbcc42424d
38 changed files with 70 additions and 70 deletions

View File

@@ -15,7 +15,6 @@
#include "blackcore/blackcoreexport.h"
#include "blackcore/contextaudio.h"
#include "blackcore/contextruntime.h"
#include "blackcore/dbusserver.h"
#include "blackcore/voice.h"
#include "blackcore/voicechannel.h"
#include "blackcore/audiodevice.h"
@@ -23,6 +22,7 @@
#include "blackcore/actionbind.h"
#include "blackinput/keyboard.h"
#include "blackcore/settings/audio.h"
#include "blackmisc/dbusserver.h"
#include "blackmisc/audio/voiceroomlist.h"
#include <QThread>
@@ -122,7 +122,7 @@ namespace BlackCore
CContextAudio(CRuntimeConfig::ContextMode mode, CRuntime *runtime);
//! Register myself in DBus
CContextAudio *registerWithDBus(CDBusServer *server)
CContextAudio *registerWithDBus(BlackMisc::CDBusServer *server)
{
if (!server || this->m_mode != CRuntimeConfig::LocalInDbusServer) { return this; }
server->addObject(IContextAudio::ObjectPath(), this);