flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-18 03:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fixed a gcc (Jenkins) warning along with that
This commit is contained in:
Klaus Basan
2015-09-26 00:38:16 +02:00
committed by Mathew Sutcliffe
parent c84bc457df
commit 3923336da8
6 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackcore/context_application.cpp
View File

@@ -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);

8
src/blackgui/models/allmodelcontainers.h
View File

@@ -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

1
src/blackgui/models/allmodels.h
View File

@@ -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"

2
src/blackgui/models/modelfilter.cpp
View File

@@ -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

1
src/blackmisc/simulation/simulatedaircraft.cpp
View File

@@ -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)

16
tests/blackmisc/testvaluecache.cpp
View File

@@ -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", {}, {}) });
CAtcStationList atcStations({ CAtcStation("EGLL_TWR" ) });
CSimulatedAircraftList aircraft({ CSimulatedAircraft("BAW001", {}, {}) });
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