refs #212, includes for contexts

This commit is contained in:
Klaus Basan
2014-04-26 15:47:33 +02:00
parent bcb6f3a479
commit 9ccf005451
4 changed files with 46 additions and 26 deletions

View File

@@ -0,0 +1,10 @@
#ifndef BLACKCORE_CONTEXT_ALL_IMPL_H
#define BLACKCORE_CONTEXT_ALL_IMPL_H
#include "context_application_impl.h"
#include "context_audio_impl.h"
#include "context_network_impl.h"
#include "context_settings_impl.h"
#include "context_simulator_impl.h"
#endif // guard

View File

@@ -0,0 +1,10 @@
#ifndef BLACKCORE_CONTEXT_ALL_ITERFACES_H
#define BLACKCORE_CONTEXT_ALL_ITERFACES_H
#include "context_application.h"
#include "context_audio.h"
#include "context_network.h"
#include "context_settings.h"
#include "context_simulator.h"
#endif // guard

View File

@@ -0,0 +1,10 @@
#ifndef BLACKCORE_CONTEXT_ALL_PROXIES_H
#define BLACKCORE_CONTEXT_ALL_PROXIES_H
#include "context_application_proxy.h"
#include "context_audio_proxy.h"
#include "context_network_proxy.h"
#include "context_settings_proxy.h"
#include "context_simulator_proxy.h"
#endif // guard

View File

@@ -1,16 +1,6 @@
#include "blackcore/context_runtime.h" #include "blackcore/context_runtime.h"
#include "blackcore/context_all_impl.h"
#include "blackcore/context_application_impl.h" #include "blackcore/context_all_proxies.h"
#include "blackcore/context_network_impl.h"
#include "blackcore/context_settings_impl.h"
#include "blackcore/context_audio_impl.h"
#include "blackcore/context_simulator_impl.h"
#include "blackcore/context_application_proxy.h"
#include "blackcore/context_network_proxy.h"
#include "blackcore/context_settings_proxy.h"
#include "blackcore/context_audio_proxy.h"
#include "blackcore/context_simulator_proxy.h"
#include "blacksim/blacksimfreefunctions.h" #include "blacksim/blacksimfreefunctions.h"
@@ -450,14 +440,14 @@ namespace BlackCore
this->m_dbusConnection = QDBusConnection::connectToPeer(address, "BlackBoxRuntime"); this->m_dbusConnection = QDBusConnection::connectToPeer(address, "BlackBoxRuntime");
} }
IContextNetwork *CRuntime::getIContextNetwork() const IContextApplication *CRuntime::getIContextApplication() const
{ {
return this->m_contextNetwork; return this->m_contextApplication;
} }
const IContextNetwork *CRuntime::getIContextNetwork() const IContextApplication *CRuntime::getIContextApplication()
{ {
return this->m_contextNetwork; return this->m_contextApplication;
} }
IContextAudio *CRuntime::getIContextAudio() IContextAudio *CRuntime::getIContextAudio()
@@ -470,6 +460,16 @@ namespace BlackCore
return this->m_contextAudio; return this->m_contextAudio;
} }
IContextNetwork *CRuntime::getIContextNetwork()
{
return this->m_contextNetwork;
}
const IContextNetwork *CRuntime::getIContextNetwork() const
{
return this->m_contextNetwork;
}
IContextSettings *CRuntime::getIContextSettings() IContextSettings *CRuntime::getIContextSettings()
{ {
return this->m_contextSettings; return this->m_contextSettings;
@@ -480,16 +480,6 @@ namespace BlackCore
return this->m_contextSettings; return this->m_contextSettings;
} }
const IContextApplication *CRuntime::getIContextApplication() const
{
return this->m_contextApplication;
}
IContextApplication *CRuntime::getIContextApplication()
{
return this->m_contextApplication;
}
const IContextSimulator *CRuntime::getIContextSimulator() const const IContextSimulator *CRuntime::getIContextSimulator() const
{ {
return this->m_contextSimulator; return this->m_contextSimulator;