From 991681a1ea63f0186bd26385ddc096f04ecc28f9 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sat, 2 Nov 2019 19:24:40 +0100
Subject: [PATCH] [AFV] Ref T739, changed facade config

* core audio mode is remote
* plus minor style changes
---
 src/blackcore/corefacadeconfig.cpp | 19 +++++++++----------
 src/blackcore/corefacadeconfig.h   | 18 +++++++++---------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/blackcore/corefacadeconfig.cpp b/src/blackcore/corefacadeconfig.cpp
index 0c5b724ab..8c5c7337f 100644
--- a/src/blackcore/corefacadeconfig.cpp
+++ b/src/blackcore/corefacadeconfig.cpp
@@ -14,12 +14,12 @@ namespace BlackCore
     {
         return (
                    // those 3 should decide whether we are running the server
-                   this->m_network == LocalInDBusServer ||
-                   this->m_ownAircraft == LocalInDBusServer ||
-                   this->m_simulator == LocalInDBusServer ||
+                   m_network == LocalInDBusServer ||
+                   m_ownAircraft == LocalInDBusServer ||
+                   m_simulator == LocalInDBusServer ||
 
                    // added as work around
-                   this->m_audio == LocalInDBusServer
+                   m_audio == LocalInDBusServer
                );
     }
 
@@ -30,11 +30,11 @@ namespace BlackCore
 
     bool CCoreFacadeConfig::any(CCoreFacadeConfig::ContextMode mode) const
     {
-        return (this->m_application == mode ||
-                this->m_audio == mode ||
-                this->m_network == mode ||
-                this->m_ownAircraft == mode ||
-                this->m_simulator == mode);
+        return (m_application == mode ||
+                m_audio       == mode ||
+                m_network     == mode ||
+                m_ownAircraft == mode ||
+                m_simulator   == mode);
     }
 
     bool CCoreFacadeConfig::anyRemote() const
@@ -62,7 +62,6 @@ namespace BlackCore
     CCoreFacadeConfig CCoreFacadeConfig::remote(const QString &dbusBootstrapAddress)
     {
         CCoreFacadeConfig cfg = CCoreFacadeConfig(CCoreFacadeConfig(CCoreFacadeConfig::Remote, dbusBootstrapAddress));
-        cfg.m_audio = CCoreFacadeConfig::LocalInDBusServer;
         return cfg;
     }
 
diff --git a/src/blackcore/corefacadeconfig.h b/src/blackcore/corefacadeconfig.h
index 29e9d7255..aeaae6ebe 100644
--- a/src/blackcore/corefacadeconfig.h
+++ b/src/blackcore/corefacadeconfig.h
@@ -52,31 +52,31 @@ namespace BlackCore
             m_dbusAddress(dbusBootstrapAddress)
         {}
 
-        //! application mode
+        //! Application mode
         ContextMode getModeApplication() const { return m_application; }
 
-        //! audio mode
+        //! Audio mode
         ContextMode getModeAudio() const { return m_audio; }
 
-        //! network mode
+        //! Network mode
         ContextMode getModeNetwork() const { return m_network; }
 
-        //! own aircraft
+        //! Own aircraft
         ContextMode getModeOwnAircraft() const { return m_ownAircraft; }
 
-        //! settings mode
+        //! Settings mode
         ContextMode getModeSettings() const { return m_settings; }
 
-        //! simulator mode
+        //! Simulator mode
         ContextMode getModeSimulator() const { return m_simulator; }
 
-        //! local settings?
+        //! Local settings?
         bool hasLocalSettings() const { return m_settings == Local || m_settings == LocalInDBusServer; }
 
-        //! requires server (at least one in server)?
+        //! Requires server (at least one in server)?
         bool requiresDBusSever() const;
 
-        //! requires DBus connection (at least one remote)?
+        //! Requires DBus connection (at least one remote)?
         bool requiresDBusConnection() const;
 
         //! DBus address