Changed to astyle format and added comment

src/blackcore/coreruntime.cpp

@@ -8,29 +8,28 @@
 
 namespace BlackCore
 {
-    /*
+/*
  * Constructor
  */
-    CCoreRuntime::CCoreRuntime(bool withDbus, QObject *parent) :
+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)
+void CCoreRuntime::init(bool withDbus)
-    {
+{
     if (m_init) return;
     BlackMisc::registerMetadata();
     BlackMisc::initResources();
 
     // TODO: read settings
-        if (withDbus)
+    if (withDbus) {
-        {
         QString dBusAddress = "session";
         this->m_dbusServer = new CDBusServer(dBusAddress, this);
     }
@@ -50,21 +49,45 @@ namespace BlackCore
 
     // flag
     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;
+}
 }

src/blackcore/coreruntime.h

@@ -5,24 +5,26 @@
 
 namespace BlackCore
 {
-    class CDBusServer;
+// forward declaration, see review
-    class CContextNetwork;
+// https://dev.vatsim-germany.org/boards/22/topics/1350?r=1359#message-1359
-    class CContextVoice;
+class CDBusServer;
-    class CContextSettings;
+class CContextNetwork;
-    class CContextApplication;
+class CContextVoice;
-    class IContextNetwork;
+class CContextSettings;
-    class IContextVoice;
+class CContextApplication;
-    class IContextSettings;
+class IContextNetwork;
-    class IContextApplication;
+class IContextVoice;
+class IContextSettings;
+class IContextApplication;
 
-    /*!
+/*!
  * \brief The CCoreRuntime class
  */
-    class CCoreRuntime : public QObject
+class CCoreRuntime : public QObject
-    {
+{
     Q_OBJECT
 
-    private:
+private:
     bool m_init; /*!< flag */
     CDBusServer *m_dbusServer;
     CContextNetwork *m_contextNetwork;
@@ -36,7 +38,7 @@ namespace BlackCore
      */
     void init(bool withDbus);
 
-    public:
+public:
     /*!
      * \brief Constructor
      * \param withDbus
@@ -53,8 +55,7 @@ namespace BlackCore
      * \brief DBus server
      * \return
      */
-        const CDBusServer *getDBusServer() const
+    const CDBusServer *getDBusServer() const {
-        {
         return this->m_dbusServer;
     }
 
@@ -107,6 +108,6 @@ namespace BlackCore
      */
     IContextApplication *getIContextApplication();
 
-    };
+};
 }
 #endif // guard