flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-06 01:45:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #369, gcc fixes

Browse Source
This commit is contained in:
Klaus Basan
2015-02-06 00:47:23 +01:00
parent f6e5b8b3b1
commit 16042c1fb2
5 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/context_simulator_impl.cpp
View File

@@ -241,6 +241,7 @@ namespace BlackCore
Q_ASSERT(c);
c = connect(networkContext, &IContextNetwork::changedAircraftEnabled, this->m_simulator, &ISimulator::changeAircraftEnabled);
Q_ASSERT(c);
Q_UNUSED(c);
for (const CSimulatedAircraft &simAircraft : networkContext->getAircraftInRange())
{
@@ -296,6 +297,7 @@ namespace BlackCore
IContextNetwork *networkContext = this->getIContextNetwork();
Q_ASSERT(networkContext);
Q_ASSERT(networkContext->isLocalObject());
Q_UNUSED(networkContext);
this->m_simulator->disconnect(); // disconnect all simulator signals
QObject::disconnect(this, nullptr, this->m_simulator, nullptr); // disconnect receiver simulator
this->m_simulator->disconnectFrom(); // disconnect from simulator

2
src/blackcore/context_simulator_proxy.cpp
View File

@@ -96,7 +96,7 @@ namespace BlackCore
CAircraftModelList CContextSimulatorProxy::getInstalledModelsStartingWith(const QString modelString) const
{
return m_dBusInterface->callDBusRet<BlackMisc::Simulation::CAircraftModelList>(QLatin1Literal("getInstalledModelsStartingWith"));
return m_dBusInterface->callDBusRet<BlackMisc::Simulation::CAircraftModelList>(QLatin1Literal("getInstalledModelsStartingWith"), modelString);
}
CAircraftIcao CContextSimulatorProxy::getIcaoForModelString(const QString &modelString) const