Changed to astyle format and added comment

This commit is contained in:
Klaus Basan
2014-01-13 13:26:30 +01:00
parent 11666da76a
commit 959f171edf
2 changed files with 170 additions and 146 deletions

View File

@@ -8,63 +8,86 @@
namespace BlackCore
{
/*
* Constructor
*/
CCoreRuntime::CCoreRuntime(bool withDbus, QObject *parent) :
QObject(parent), m_init(false), m_dbusServer(nullptr),
m_contextNetwork(nullptr), m_contextVoice(nullptr),
m_contextSettings(nullptr), m_contextApplication(nullptr)
{
this->init(withDbus);
}
/*
* Init runtime
*/
void CCoreRuntime::init(bool withDbus)
{
if (m_init) return;
BlackMisc::registerMetadata();
BlackMisc::initResources();
// TODO: read settings
if (withDbus)
{
QString dBusAddress = "session";
this->m_dbusServer = new CDBusServer(dBusAddress, this);
}
// contexts
this->m_contextSettings = new CContextSettings(this);
if (withDbus) this->m_contextSettings->registerWithDBus(this->m_dbusServer);
this->m_contextNetwork = new CContextNetwork(this);
if (withDbus) this->m_contextNetwork->registerWithDBus(this->m_dbusServer);
this->m_contextApplication = new CContextApplication(this);
if (withDbus) this->m_contextApplication->registerWithDBus(this->m_dbusServer);
this->m_contextVoice = new CContextVoice(this);
if (withDbus) this->m_contextVoice->registerWithDBus(this->m_dbusServer);
// flag
m_init = true;
}
IContextNetwork *CCoreRuntime::getIContextNetwork() { return this->m_contextNetwork; }
const IContextNetwork *CCoreRuntime::getIContextNetwork() const { return this->m_contextNetwork; }
IContextVoice *CCoreRuntime::getIContextVoice() { return this->m_contextVoice; }
const IContextVoice *CCoreRuntime::getIContextVoice() const { return this->m_contextVoice; }
IContextSettings *CCoreRuntime::getIContextSettings() { return this->m_contextSettings; }
const IContextSettings *CCoreRuntime::getIContextSettings() const { return this->m_contextSettings; }
const IContextApplication *CCoreRuntime::getIContextApplication() const { return this->m_contextApplication; }
IContextApplication *CCoreRuntime::getIContextApplication() { return this->m_contextApplication; }
/*
* Constructor
*/
CCoreRuntime::CCoreRuntime(bool withDbus, QObject *parent) :
QObject(parent), m_init(false), m_dbusServer(nullptr),
m_contextNetwork(nullptr), m_contextVoice(nullptr),
m_contextSettings(nullptr), m_contextApplication(nullptr)
{
this->init(withDbus);
}
/*
* Init runtime
*/
void CCoreRuntime::init(bool withDbus)
{
if (m_init) return;
BlackMisc::registerMetadata();
BlackMisc::initResources();
// TODO: read settings
if (withDbus) {
QString dBusAddress = "session";
this->m_dbusServer = new CDBusServer(dBusAddress, this);
}
// contexts
this->m_contextSettings = new CContextSettings(this);
if (withDbus) this->m_contextSettings->registerWithDBus(this->m_dbusServer);
this->m_contextNetwork = new CContextNetwork(this);
if (withDbus) this->m_contextNetwork->registerWithDBus(this->m_dbusServer);
this->m_contextApplication = new CContextApplication(this);
if (withDbus) this->m_contextApplication->registerWithDBus(this->m_dbusServer);
this->m_contextVoice = new CContextVoice(this);
if (withDbus) this->m_contextVoice->registerWithDBus(this->m_dbusServer);
// flag
m_init = true;
}
IContextNetwork *CCoreRuntime::getIContextNetwork()
{
return this->m_contextNetwork;
}
const IContextNetwork *CCoreRuntime::getIContextNetwork() const
{
return this->m_contextNetwork;
}
IContextVoice *CCoreRuntime::getIContextVoice()
{
return this->m_contextVoice;
}
const IContextVoice *CCoreRuntime::getIContextVoice() const
{
return this->m_contextVoice;
}
IContextSettings *CCoreRuntime::getIContextSettings()
{
return this->m_contextSettings;
}
const IContextSettings *CCoreRuntime::getIContextSettings() const
{
return this->m_contextSettings;
}
const IContextApplication *CCoreRuntime::getIContextApplication() const
{
return this->m_contextApplication;
}
IContextApplication *CCoreRuntime::getIContextApplication()
{
return this->m_contextApplication;
}
}