refs #452 changes because of the 452 branch, but only possible after merge with master

Fixed a gcc (Jenkins) warning along with that

src/blackcore/context_application.cpp

@@ -53,6 +53,7 @@ namespace BlackCore
         {
             this->changeSettings(settings, {});
         });
+
         connect(this, &IContextApplication::settingsChanged, [](const CVariantMap &settings, const CIdentifier &origin)
         {
             // Intentionally don't check for round trip here
@@ -63,24 +64,32 @@ namespace BlackCore
         {
             this->registerHotkeyActions(actions, {});
         });
-        Q_ASSERT(s);
+        Q_ASSERT_X(s, Q_FUNC_INFO, "Connect hotkey action failed");
+        Q_UNUSED(s);
+
         s = connect(this, &IContextApplication::hotkeyActionsRegistered, [this](const QStringList &actions, const CIdentifier &origin)
         {
             if(origin.isFromSameProcess()) { return; }
             CInputManager::instance()->registerRemoteActions(actions);
         });
-        Q_ASSERT(s);
+        Q_ASSERT_X(s, Q_FUNC_INFO, "Connect hotkey actions failed");
+        Q_UNUSED(s);
 
-        connect(CInputManager::instance(), &CInputManager::remoteActionFromLocal, [this](const QString &action, bool argument)
+        s = connect(CInputManager::instance(), &CInputManager::remoteActionFromLocal, [this](const QString &action, bool argument)
         {
             this->callHotkeyAction(action, argument, {});
         });
-        connect(this, &IContextApplication::remoteHotkeyAction, [this](const QString &action, bool argument, const CIdentifier &origin)
+        Q_ASSERT_X(s, Q_FUNC_INFO, "Connect remote action failed");
+        Q_UNUSED(s);
+
+        s = connect(this, &IContextApplication::remoteHotkeyAction, [this](const QString &action, bool argument, const CIdentifier &origin)
         {
             if(origin.isFromLocalMachine()) { return; }
             CInputManager::instance()->callFunctionsBy(action, argument);
             CLogMessage(this, CLogCategory::contextSlot()).debug() << "Calling function" << action << "from origin" << origin.getMachineName();
         });
+        Q_ASSERT_X(s, Q_FUNC_INFO, "Connect remote hotkey action failed");
+        Q_UNUSED(s);
 
         // Enable event forwarding from GUI process to core
         CInputManager::instance()->setForwarding(true);

src/blackgui/models/allmodelcontainers.h

@@ -15,19 +15,17 @@
 #include "blackmisc/aviation/airportlist.h"
 #include "blackmisc/aviation/atcstationlist.h"
 #include "blackmisc/aviation/liverylist.h"
-#include "blackmisc/countrylist.h"
-#include "blackmisc/identifierlist.h"
 #include "blackmisc/input/actionhotkeylist.h"
-#include "blackmisc/namevariantpairlist.h"
-#include "blackmisc/network/aircraftmappinglist.h"
 #include "blackmisc/network/clientlist.h"
 #include "blackmisc/network/serverlist.h"
 #include "blackmisc/network/textmessagelist.h"
 #include "blackmisc/network/userlist.h"
-#include "blackmisc/setkeyboardhotkeylist.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/simulation/distributorlist.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
+#include "blackmisc/countrylist.h"
+#include "blackmisc/namevariantpairlist.h"
 #include "blackmisc/statusmessagelist.h"
+#include "blackmisc/identifierlist.h"
 
 #endif // guard

src/blackgui/models/allmodels.h

@@ -21,7 +21,6 @@
 #include "blackgui/models/countrylistmodel.h"
 #include "blackgui/models/distributorlistmodel.h"
 #include "blackgui/models/identifierlistmodel.h"
-#include "blackgui/models/keyboardkeylistmodel.h"
 #include "blackgui/models/liverylistmodel.h"
 #include "blackgui/models/namevariantpairlistmodel.h"
 #include "blackgui/models/serverlistmodel.h"

src/blackgui/models/modelfilter.cpp

@@ -82,7 +82,5 @@ namespace BlackGui
         template class IModelFilter<BlackMisc::Simulation::CAircraftModelList>;
         template class IModelFilter<BlackMisc::Simulation::CDistributorList>;
 
-        template class IModelFilter<BlackMisc::Settings::CSettingKeyboardHotkeyList>;
-
     } // namespace
 } // namespace

src/blackmisc/simulation/simulatedaircraft.cpp

@@ -202,7 +202,6 @@ namespace BlackMisc
         void CSimulatedAircraft::setParts(const CAircraftParts &parts)
         {
             m_parts = parts;
-            m_parts.setCallsign(this->getCallsign());
         }
 
         void CSimulatedAircraft::setLights(CAircraftLights &lights)

tests/blackmisc/testvaluecache.cpp

@@ -10,15 +10,16 @@
 #include "testvaluecache.h"
 #include "blackmisc/worker.h"
 #include "blackmisc/identifier.h"
-#include "blackmisc/aviation/aircraftlist.h"
 #include "blackmisc/aviation/atcstationlist.h"
+#include "blackmisc/simulation/simulatedaircraftlist.h"
+
 #include <future>
 
 namespace BlackMiscTest
 {
-
     using namespace BlackMisc;
     using namespace BlackMisc::Aviation;
+    using namespace BlackMisc::Simulation;
 
     CTestValueCache::CTestValueCache(QObject *parent) : QObject(parent)
     {
@@ -200,8 +201,8 @@ namespace BlackMiscTest
 
     void CTestValueCache::saveAndLoad()
     {
-        CAircraftList aircraft({ CAircraft("BAW001", {}, {}) });
+        CSimulatedAircraftList aircraft({ CSimulatedAircraft("BAW001", {}, {}) });
-        CAtcStationList atcStations({ CAtcStation("EGLL_TWR" ) });
+        CAtcStationList atcStations({ CAtcStation("EGLL_TWR") });
         CVariantMap testData
         {
             { "namespace1/value1", CVariant::from(1) },
@@ -251,10 +252,11 @@ namespace BlackMiscTest
         m_slotFired = std::promise<void>();
         switch (status)
         {
-        case std::future_status::deferred: default: QTEST_ASSERT(false);
         case std::future_status::ready: return true;
         case std::future_status::timeout: return false;
+        case std::future_status::deferred:
+        default: QTEST_ASSERT(false);
         }
+        return false;
     }
-
+} // ns
-}