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

@@ -29,8 +29,7 @@ namespace BlackCore
BlackMisc::initResources(); BlackMisc::initResources();
// TODO: read settings // TODO: read settings
if (withDbus) if (withDbus) {
{
QString dBusAddress = "session"; QString dBusAddress = "session";
this->m_dbusServer = new CDBusServer(dBusAddress, this); this->m_dbusServer = new CDBusServer(dBusAddress, this);
} }
@@ -52,19 +51,43 @@ namespace BlackCore
m_init = true; m_init = true;
} }
IContextNetwork *CCoreRuntime::getIContextNetwork() { return this->m_contextNetwork; } IContextNetwork *CCoreRuntime::getIContextNetwork()
{
const IContextNetwork *CCoreRuntime::getIContextNetwork() const { return this->m_contextNetwork; } return this->m_contextNetwork;
}
IContextVoice *CCoreRuntime::getIContextVoice() { return this->m_contextVoice; }
const IContextNetwork *CCoreRuntime::getIContextNetwork() const
const IContextVoice *CCoreRuntime::getIContextVoice() const { return this->m_contextVoice; } {
return this->m_contextNetwork;
IContextSettings *CCoreRuntime::getIContextSettings() { return this->m_contextSettings; } }
const IContextSettings *CCoreRuntime::getIContextSettings() const { return this->m_contextSettings; } IContextVoice *CCoreRuntime::getIContextVoice()
{
const IContextApplication *CCoreRuntime::getIContextApplication() const { return this->m_contextApplication; } return this->m_contextVoice;
}
IContextApplication *CCoreRuntime::getIContextApplication() { return this->m_contextApplication; }
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;
}
} }

View File

@@ -5,6 +5,8 @@
namespace BlackCore namespace BlackCore
{ {
// forward declaration, see review
// https://dev.vatsim-germany.org/boards/22/topics/1350?r=1359#message-1359
class CDBusServer; class CDBusServer;
class CContextNetwork; class CContextNetwork;
class CContextVoice; class CContextVoice;
@@ -53,8 +55,7 @@ namespace BlackCore
* \brief DBus server * \brief DBus server
* \return * \return
*/ */
const CDBusServer *getDBusServer() const const CDBusServer *getDBusServer() const {
{
return this->m_dbusServer; return this->m_dbusServer;
} }